Further cleanups, some deprecated stuff removed from mkdxsinitrd (the

options -D, -v are not available any more, see MkinitrdHowto for more
information)



git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1003 95ad53e4-c205-0410-b2fa-d234c58c8868

5 files changed, 8 insertions, 15 deletions

diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 88e7a2f1..b5d93376 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -28,8 +28,7 @@ config_distro () {
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
-# AUS SuSE-9.3
-# udev/hotplug - auto device discovery service
+# udev/hotplug - auto device discovery service (deprecated, check and remove)
 # Result: 1 is bad, 0 is good
 udev_hotplug () {
   local result=0
@@ -63,7 +62,6 @@ local start="$2"
 local stop="$3"
 # empty runlevel links - decision on running certain services is
 # passed via configuration
-# "stop" seems not to be used in Debian!? - It is. Felix
 for i in rc2.d/K$stop$script rc3.d/K$stop$script \
          rc2.d/S$start$script rc3.d/S$start$script ; do
   if ! [ -f /mnt/etc/init.d/$script ]; then
@@ -210,7 +208,6 @@ done
 #PATH=\"\$PATH:/var/X11R6/bin\"" >>/mnt/etc/profile
 }
 
-
 # consolefont and language
 consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 83f4c3c8..37a61791 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -16,7 +16,7 @@
 
 # distro specific general function called from servconfig script
 config_distro () {
-echo -e "OpenSLX version 4.0.6\ninitramfs generation date $date" \
+echo -e "OpenSLX version ${SLXVERSION}\ninitramfs generation date $date" \
   >> /mnt/etc/gentoo-release
 echo -e "# changes made to this file by $0 (initramfs from $date)" \
   > /etc/rc.conf
@@ -24,7 +24,7 @@ echo -e "# changes made to this file by $0 (initramfs from $date)" \
 config_rc_entry "KEYMAP" "${KEYTABLE}" "conf.d/keymaps"
 }
 
-# udev service - not verified!
+# udev service (fixme: deprecated, check and remove!!)
 udev_hotplug () {
 ln -s /bin/udevd /bin/udevstart && udevstart &
 if [ -x /bin/udevd ] ; then
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index c7a01fed..9364376f 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -57,8 +57,7 @@ config_distro () {
   sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
 }
 
-# AUS SuSE-9.3
-# udev/hotplug - auto device discovery service
+# udev/hotplug - auto device discovery service (deprecated)
 # Result: 1 is bad, 0 is good
 udev_hotplug () {
   local result=0
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index b90b60b9..9e829375 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -90,8 +90,9 @@ hwautocfg pre
 preinit
 [ -x /bin/preinit.local ] && /bin/preinit.local
 
-# start device auto discovery service - busybox or distro specific function
-runudev
+# start device auto discovery service - busybox (or distro specific function)
+#mdev -s # enable this one
+runudev #(remove that functions soon, see #129, #130 ...)
 
 # switch off the several configuration methods, will be switched on
 # according to kernel commandline settings
diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd
index 645108aa..e00e158b 100755
--- a/initramfs/mkdxsinitrd
+++ b/initramfs/mkdxsinitrd
@@ -86,10 +86,6 @@ usage()
   echo "        (z.B. /var/opt/openslx/stage1/suse-10.2)."
   echo "  -s theme (for splash)"
   echo "  -t tpm support (client security)"
-  echo "  -D Name"
-  echo "        Name der Distribution der Betriebsystemvorlage"
-  echo "  -v Version"
-  echo "        Versionskennung der Distribution der Betriebsystemvorlage"
   exit 0
 }
 
@@ -308,7 +304,7 @@ cp -a ${themes}* ${INSTDIR}/usr/share/themes
 #########################################################################
 # End of function declaration
 
-while getopts :dhk:c:i:r:o:s:f:n:m:Sut:v:I:a: a ; do
+while getopts :dhk:c:i:r:o:s:f:n:m:Sut:I:a: a ; do
   case $a in
     \:|\?)
     case $OPTARG in