jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

busybox: remove CIFS/SMB boot support

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-08-17 15:54:20 +02:00
parent 5eb91bcf1b
commit 26c49caf2b
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/sysutils/busybox/config/busybox-init.conf
View File

@ -585,7 +585,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
# CONFIG_FEATURE_MOUNT_HELPERS is not set # CONFIG_FEATURE_MOUNT_HELPERS is not set
CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_LABEL=y
CONFIG_FEATURE_MOUNT_NFS=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_FLAGS=y
# CONFIG_FEATURE_MOUNT_FSTAB is not set # CONFIG_FEATURE_MOUNT_FSTAB is not set
CONFIG_PIVOT_ROOT=y CONFIG_PIVOT_ROOT=y

16
packages/sysutils/busybox/scripts/init
View File

@ -74,7 +74,7 @@
boot=*) boot=*)
boot="${arg#*=}" boot="${arg#*=}"
case $boot in case $boot in
CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*) ISCSI=*|NBD=*|NFS=*)
UPDATE_DISABLED=yes UPDATE_DISABLED=yes
FLASH_NETBOOT=yes FLASH_NETBOOT=yes
;; ;;
@ -86,7 +86,7 @@
disk=*) disk=*)
disk="${arg#*=}" disk="${arg#*=}"
case $disk in case $disk in
CIFS=*|SMB=*|ISCSI=*|NBD=*|NFS=*) ISCSI=*|NBD=*|NFS=*)
STORAGE_NETBOOT=yes STORAGE_NETBOOT=yes
;; ;;
/dev/*|LABEL=*|UUID=*) /dev/*|LABEL=*|UUID=*)
@ -189,15 +189,6 @@
[ "$ERR_ENV" -ne "0" ] && error "mount_common" "Could not mount $1" [ "$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() { get_iscsistart_options() {
# Convert kernel commandline ISCSI= options to iscsistart options # Convert kernel commandline ISCSI= options to iscsistart options
IFS_SAVE="$IFS" IFS_SAVE="$IFS"
@ -299,9 +290,6 @@
MOUNT_CMD="mount_common" MOUNT_CMD="mount_common"
MOUNT_TARGET="$1" MOUNT_TARGET="$1"
;; ;;
CIFS=*|SMB=*)
MOUNT_CMD="mount_cifs"
;;
ISCSI=*) ISCSI=*)
MOUNT_CMD="mount_iscsi" MOUNT_CMD="mount_iscsi"
;; ;;