diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index 2d217b216c..2fa3a4773a 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -585,7 +585,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y # CONFIG_FEATURE_MOUNT_HELPERS is not set CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y +# CONFIG_FEATURE_MOUNT_CIFS is not set CONFIG_FEATURE_MOUNT_FLAGS=y # CONFIG_FEATURE_MOUNT_FSTAB is not set CONFIG_PIVOT_ROOT=y diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init index 1c1e3005fa..625f49480c 100755 --- a/packages/sysutils/busybox/scripts/init +++ b/packages/sysutils/busybox/scripts/init @@ -74,7 +74,7 @@ boot=*) boot="${arg#*=}" case $boot in - CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*) + ISCSI=*|NBD=*|NFS=*) UPDATE_DISABLED=yes FLASH_NETBOOT=yes ;; @@ -86,7 +86,7 @@ disk=*) disk="${arg#*=}" case $disk in - CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*) + ISCSI=*|NBD=*|NFS=*) STORAGE_NETBOOT=yes ;; /dev/*|LABEL=*|UUID=*) @@ -189,15 +189,6 @@ [ "$ERR_ENV" -ne "0" ] && error "mount_common" "Could not mount $1" } - mount_cifs() { - # Mount CIFS (Samba) share - CIFS_SHARE="${1%%,*}" - CIFS_OPTIONS="${1#*,}" - [ "$CIFS_OPTIONS" = "$1" ] && CIFS_OPTIONS= - - mount_common "$CIFS_SHARE" "$2" "$3,$CIFS_OPTIONS" "cifs" - } - get_iscsistart_options() { # Convert kernel commandline ISCSI= options to iscsistart options IFS_SAVE="$IFS" @@ -299,9 +290,6 @@ MOUNT_CMD="mount_common" MOUNT_TARGET="$1" ;; - CIFS=*|SMB=*) - MOUNT_CMD="mount_cifs" - ;; ISCSI=*) MOUNT_CMD="mount_iscsi" ;;