Busybox noch umgearbeitet... Sollte jetz die CD auswerfen...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@598 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config
index 700e0b48c3237511c1c771be67c6fc898ad7694f..523c92aaf6349a5068bc99c5dadc673b16a4c29b 100644 (file)
--- a/config/uClibc/busybox.config
+++ b/config/uClibc/busybox.config
@@ -86,10 +86,10 @@ CONFIG_GZIP=y
 CONFIG_TAR=y
 # CONFIG_FEATURE_TAR_CREATE is not set
 CONFIG_FEATURE_TAR_BZIP2=y
-CONFIG_FEATURE_TAR_LZMA=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_COMPRESS=y
+# CONFIG_FEATURE_TAR_LZMA is not set
+# CONFIG_FEATURE_TAR_FROM is not set
+# CONFIG_FEATURE_TAR_GZIP is not set
+# CONFIG_FEATURE_TAR_COMPRESS is not set
 CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
@@ -115,7 +115,7 @@ CONFIG_CAT=y
 # CONFIG_CATV is not set
 # CONFIG_CHGRP is not set
 CONFIG_CHMOD=y
-# CONFIG_CHOWN is not set
+CONFIG_CHOWN=y
 CONFIG_CHROOT=y
 # CONFIG_CKSUM is not set
 # CONFIG_CMP is not set
@@ -393,11 +393,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
-CONFIG_MKFS_MINIX=y
-
-#
-# Minix filesystem support
-#
+# CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
 # CONFIG_GETOPT is not set
 # CONFIG_HEXDUMP is not set
@@ -423,7 +419,7 @@ CONFIG_PIVOT_ROOT=y
 CONFIG_SWAPONOFF=y
 # CONFIG_SWITCH_ROOT is not set
 CONFIG_UMOUNT=y
-# CONFIG_FEATURE_UMOUNT_ALL is not set
+CONFIG_FEATURE_UMOUNT_ALL=y
 
 #
 # Common options for mount/umount
@@ -446,7 +442,7 @@ CONFIG_FEATURE_MOUNT_LOOP=y
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
-# CONFIG_EJECT is not set
+CONFIG_EJECT=y
 # CONFIG_LAST is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_BRACKETS=y
@@ -522,10 +518,10 @@ CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
 # CONFIG_IPTUNNEL is not set
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
@@ -561,14 +557,14 @@ CONFIG_ROUTE=y
 # CONFIG_APP_UDHCPD is not set
 CONFIG_APP_UDHCPC=y
 # CONFIG_APP_DUMPLEASES is not set
-CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_SYSLOG is not set
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_VCONFIG=y
+# CONFIG_WGET is not set
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
 # CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 # CONFIG_ZCIP is not set
 
 #
@@ -587,7 +583,7 @@ CONFIG_RENICE=y
 # CONFIG_BB_SYSCTL is not set
 CONFIG_TOP=y
 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-# CONFIG_UPTIME is not set
+CONFIG_UPTIME=y
 
 #
 # Shells

diff --git a/src/install+setup/install/cdrom.c b/src/install+setup/install/cdrom.c
index af49061d5f64e043efc4e6ed39d41c2ed8c0e298..9514226ffa6062ac7025d5a0a0d69c2615cd9d00 100644 (file)
--- a/src/install+setup/install/cdrom.c
+++ b/src/install+setup/install/cdrom.c
@@ -18,17 +18,10 @@ extern char **ctr;
 /* Ejects the CDROM.  returns 0 for failure, 1 for success. */
 int ejectcdrom(char *dev)
 {
-       int fd;
-
-       if ((fd = open(dev, O_RDONLY|O_NONBLOCK)) == -1)
-               return 0;
-       
-       if (ioctl(fd, 0x5309) == -1)
-       {
-               close(fd);
+       char command;
+       sprintf(command, "eject -r %s", dev);
+       if (mysystem(command))
                return 0;
-       }
-       close(fd);
-       
-       return 1;
+       else
+               return 1;
 }