bugfixed boot script, udev init script, cups and shadow package

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index bde3ceaec5b19b4f612cf5fe573ef843e44071b8..710a0f6b7cfc33ce165554cba16355511903e271 100644 (file)
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -10,7 +10,9 @@
 #                                      #
 #########################################
 
-- delimiter not delimeter in udev init script
+- bugfixes in shadow package
+- delete cups init scripts created by cups package
+- delimiter not delimeter in udev init script, + mounting of pts/shm
 - fixed pkg_dir bug in Create-Binary
 - network config via dhcp / dhclient in /usr/sbin (bad?)
 - linux config changes, no devfs mount at startup

diff --git a/misc/sysfiles/etc/init.d/boot b/misc/sysfiles/etc/init.d/boot
index 7352c7e3d08ece3e2b627f3e84396881dc493924..9e1a3be2d90ffca47c648913678eb306bc76dd8f 100755 (executable)
--- a/misc/sysfiles/etc/init.d/boot
+++ b/misc/sysfiles/etc/init.d/boot
@@ -18,8 +18,6 @@ if [ $FORCEFSCK = 1 ] ; then echo "going to force fsck" ; FASTBOOT=0 ; fi
 
 mount -v -n /dev
 mount -v -n /proc ; mount -v -n /sys
-mkdir -p /dev/shm ; mount -v -n /dev/shm
-mkdir -p /dev/pts ; mount -v -n /dev/pts
 
 echo "loading kernel modules and configuring the kernel ..."
 . /etc/conf/kernel

diff --git a/packages/base/shadow/shadow b/packages/base/shadow/shadow
index cd2e5fcea7b95ff021bc3b052d41a69b8dd13bed..e695f4be9ef748f5fdb2bfa4beddd172bdb76f1d 100644 (file)
--- a/packages/base/shadow/shadow
+++ b/packages/base/shadow/shadow
@@ -15,14 +15,13 @@ pre_install()       {
                }
 
 post_install() {
-       cp etc/{limits,login.access} $root/etc &&
+       cp etc/{limits,login.access} $root/etc
        sed -e 's%/var/spool/mail%/var/mail%' \
                -e 's%#MD5_CRYPT_ENAB.no%MD5_CRYPT_ENAB yes%' \
-               etc/login.defs.linux > $root/etc/login.defs &&
-       rm $root/bin/groups &&
-       mv $root/bin/sg $prefix/bin &&
-       mv $root/bin/vigr $prefix/sbin &&
-       mv $prefix/passwd $root/bin &&
+               etc/login.defs.linux > $root/etc/login.defs
+       rm -f $root/bin/groups
+       mv $prefix/bin/vigr $prefix/sbin
+       mv $prefix/bin/{login,passwd} $root/bin
        mv $prefix/lib/lib{shadow,misc}.so.0* $root/lib
        ln -sf ../../lib/libshadow.so.0 $prefix/lib/libshadow.so
        ln -sf ../../lib/libmisc.so.0 $prefix/lib/libmisc.so

diff --git a/packages/base/udev/init_udev.sh b/packages/base/udev/init_udev.sh
index 408841a089791d6a931756bee3a45b9a4ca967f0..75280856334103708a0ef9a0aaf41866d66e12c2 100644 (file)
--- a/packages/base/udev/init_udev.sh
+++ b/packages/base/udev/init_udev.sh
@@ -46,14 +46,17 @@ add_nodes() {
        ln -snf /proc/self/fd/1 $udev_root/stdout
        ln -snf /proc/self/fd/2 $udev_root/stderr
        ln -snf /proc/kcore $udev_root/core
-
        mkdir $udev_root/pts
+       mount $udev_root/pts
        mkdir $udev_root/shm
+       mount $udev_root/shm
 }
 
 # delete them when shutting down (not used right now)
 del_nodes()    {
-       rm $udev_root/{fd,stdin,stdout,stderr,core}
+       umount $udev_root/shm
+       umount $udev_root/pts
+       rm -rf $udev_root/{fd,stdin,stdout,stderr,core,pts,shm}
 }
 
 # main procedures
@@ -74,7 +77,6 @@ in
                add_nodes
                $udevd &
                echo " done"
-               touch /var/lock/subsys/udev
                ;;
        stop)
                echo -n "stopping udev ..."
@@ -82,7 +84,6 @@ in
                run_udev
                del_nodes
                echo " done"
-               rm /var/lock/subsys/udev
                ;;
        restart)
                /etc/init.d/udev stop

diff --git a/packages/hackbard/cups/cups b/packages/hackbard/cups/cups
index 6fec009a3fbaafeccf680ead17f9c02360db85e7..fc0b7e170b868452a50d4cb2a98d540edac353e1 100644 (file)
--- a/packages/hackbard/cups/cups
+++ b/packages/hackbard/cups/cups
@@ -8,3 +8,8 @@
 
 confopt="$confopt --disable-ssl --with-logdir=$root/var/cups/log"
 confopt="$confopt --with-cups-user=daemon --with-cups-group=daemon"
+
+post_install() {
+       rm -rf $root/etc/init.d/rc0.d
+       rm -rf $root/etc/init.d/*/*cups
+               }