wok-6.x rev 18787
busybox: /init calls some busybox applets, keep then (Thanks llev)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Jan 04 20:59:14 2016 +0100 (2016-01-04) |
parents | c0cb4b7f2e21 |
children | a4c10aa3ed2d |
files | busybox/stuff/busybox-1.23.config syslinux/stuff/iso2exe/win32.c |
line diff
1.1 --- a/busybox/stuff/busybox-1.23.config Mon Jan 04 15:45:31 2016 +0100 1.2 +++ b/busybox/stuff/busybox-1.23.config Mon Jan 04 20:59:14 2016 +0100 1.3 @@ -509,17 +509,17 @@ 1.4 # 1.5 # Linux Module Utilities 1.6 # 1.7 -# CONFIG_MODINFO is not set 1.8 +CONFIG_MODINFO=y 1.9 # CONFIG_MODPROBE_SMALL is not set 1.10 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set 1.11 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set 1.12 -# CONFIG_INSMOD is not set 1.13 -# CONFIG_RMMOD is not set 1.14 +CONFIG_INSMOD=y 1.15 +CONFIG_RMMOD=y 1.16 CONFIG_LSMOD=y 1.17 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y 1.18 CONFIG_MODPROBE=y 1.19 CONFIG_FEATURE_MODPROBE_BLACKLIST=y 1.20 -# CONFIG_DEPMOD is not set 1.21 +CONFIG_DEPMOD=y 1.22 1.23 # 1.24 # Options common to multiple modutils 1.25 @@ -553,8 +553,8 @@ 1.26 CONFIG_REV=y 1.27 # CONFIG_ACPID is not set 1.28 # CONFIG_FEATURE_ACPID_COMPAT is not set 1.29 -# CONFIG_BLKID is not set 1.30 -# CONFIG_FEATURE_BLKID_TYPE is not set 1.31 +CONFIG_BLKID=y 1.32 +CONFIG_FEATURE_BLKID_TYPE=y 1.33 CONFIG_DMESG=y 1.34 CONFIG_FEATURE_DMESG_PRETTY=y 1.35 CONFIG_FBSET=y 1.36 @@ -571,7 +571,7 @@ 1.37 # CONFIG_FEATURE_OSF_LABEL is not set 1.38 CONFIG_FEATURE_GPT_LABEL=y 1.39 # CONFIG_FEATURE_FDISK_ADVANCED is not set 1.40 -# CONFIG_FINDFS is not set 1.41 +CONFIG_FINDFS=y 1.42 CONFIG_FLOCK=y 1.43 CONFIG_FREERAMDISK=y 1.44 # CONFIG_FSCK_MINIX is not set 1.45 @@ -596,15 +596,15 @@ 1.46 CONFIG_MKSWAP=y 1.47 CONFIG_FEATURE_MKSWAP_UUID=y 1.48 CONFIG_MORE=y 1.49 -+CONFIG_MOUNT=y 1.50 +CONFIG_MOUNT=y 1.51 # CONFIG_FEATURE_MOUNT_FAKE is not set 1.52 # CONFIG_FEATURE_MOUNT_VERBOSE is not set 1.53 -# CONFIG_FEATURE_MOUNT_HELPERS is not set 1.54 -# CONFIG_FEATURE_MOUNT_LABEL is not set 1.55 -# CONFIG_FEATURE_MOUNT_NFS is not set 1.56 -# CONFIG_FEATURE_MOUNT_CIFS is not set 1.57 -# CONFIG_FEATURE_MOUNT_FLAGS is not set 1.58 -# CONFIG_FEATURE_MOUNT_FSTAB is not set 1.59 +CONFIG_FEATURE_MOUNT_HELPERS=y 1.60 +CONFIG_FEATURE_MOUNT_LABEL=y 1.61 +CONFIG_FEATURE_MOUNT_NFS=y 1.62 +CONFIG_FEATURE_MOUNT_CIFS=y 1.63 +CONFIG_FEATURE_MOUNT_FLAGS=y 1.64 +CONFIG_FEATURE_MOUNT_FSTAB=y 1.65 CONFIG_PIVOT_ROOT=y 1.66 CONFIG_RDATE=y 1.67 CONFIG_RDEV=y 1.68 @@ -617,33 +617,41 @@ 1.69 CONFIG_FEATURE_SWAPON_DISCARD=y 1.70 CONFIG_FEATURE_SWAPON_PRI=y 1.71 CONFIG_SWITCH_ROOT=y 1.72 -# CONFIG_UMOUNT is not set 1.73 -# CONFIG_FEATURE_UMOUNT_ALL is not set 1.74 -# CONFIG_FEATURE_MOUNT_LOOP is not set 1.75 -# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set 1.76 +CONFIG_UMOUNT=y 1.77 +CONFIG_FEATURE_UMOUNT_ALL=y 1.78 + 1.79 +# 1.80 +# Common options for mount/umount 1.81 +# 1.82 +CONFIG_FEATURE_MOUNT_LOOP=y 1.83 +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y 1.84 # CONFIG_FEATURE_MTAB_SUPPORT is not set 1.85 -# CONFIG_VOLUMEID is not set 1.86 -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set 1.87 +CONFIG_VOLUMEID=y 1.88 + 1.89 +# 1.90 +# Filesystem/Volume identification 1.91 +# 1.92 +CONFIG_FEATURE_VOLUMEID_BTRFS=y 1.93 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set 1.94 -# CONFIG_FEATURE_VOLUMEID_EXFAT is not set 1.95 -# CONFIG_FEATURE_VOLUMEID_EXT is not set 1.96 -# CONFIG_FEATURE_VOLUMEID_F2FS is not set 1.97 -# CONFIG_FEATURE_VOLUMEID_FAT is not set 1.98 -# CONFIG_FEATURE_VOLUMEID_HFS is not set 1.99 -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set 1.100 +CONFIG_FEATURE_VOLUMEID_EXFAT=y 1.101 +CONFIG_FEATURE_VOLUMEID_EXT=y 1.102 +CONFIG_FEATURE_VOLUMEID_F2FS=y 1.103 +CONFIG_FEATURE_VOLUMEID_FAT=y 1.104 +CONFIG_FEATURE_VOLUMEID_HFS=y 1.105 +CONFIG_FEATURE_VOLUMEID_ISO9660=y 1.106 # CONFIG_FEATURE_VOLUMEID_JFS is not set 1.107 -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set 1.108 -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set 1.109 -# CONFIG_FEATURE_VOLUMEID_LUKS is not set 1.110 -# CONFIG_FEATURE_VOLUMEID_NILFS is not set 1.111 -# CONFIG_FEATURE_VOLUMEID_NTFS is not set 1.112 +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y 1.113 +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y 1.114 +CONFIG_FEATURE_VOLUMEID_LUKS=y 1.115 +CONFIG_FEATURE_VOLUMEID_NILFS=y 1.116 +CONFIG_FEATURE_VOLUMEID_NTFS=y 1.117 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set 1.118 -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set 1.119 -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set 1.120 -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set 1.121 +CONFIG_FEATURE_VOLUMEID_REISERFS=y 1.122 +CONFIG_FEATURE_VOLUMEID_ROMFS=y 1.123 +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y 1.124 # CONFIG_FEATURE_VOLUMEID_SYSV is not set 1.125 -# CONFIG_FEATURE_VOLUMEID_UDF is not set 1.126 -# CONFIG_FEATURE_VOLUMEID_XFS is not set 1.127 +CONFIG_FEATURE_VOLUMEID_UDF=y 1.128 +CONFIG_FEATURE_VOLUMEID_XFS=y 1.129 1.130 # 1.131 # Miscellaneous Utilities 1.132 @@ -724,7 +732,7 @@ 1.133 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set 1.134 # CONFIG_MAN is not set 1.135 CONFIG_MICROCOM=y 1.136 -# CONFIG_MOUNTPOINT is not set 1.137 +CONFIG_MOUNTPOINT=y 1.138 CONFIG_MT=y 1.139 CONFIG_RAIDAUTORUN=y 1.140 # CONFIG_READAHEAD is not set
2.1 --- a/syslinux/stuff/iso2exe/win32.c Mon Jan 04 15:45:31 2016 +0100 2.2 +++ b/syslinux/stuff/iso2exe/win32.c Mon Jan 04 20:59:14 2016 +0100 2.3 @@ -4,7 +4,7 @@ 2.4 #include <sys/stat.h> 2.5 #include <fcntl.h> 2.6 2.7 -#define BOOTSTRAP_SECTOR_COUNT_OFFSET 28 2.8 +#define BOOTSTRAP_SECTOR_COUNT_OFFSET 26 2.9 2.10 static int fullread(int fd, char *p, int n) 2.11 {