From 2291d42be23c84a59f1d8ccdc22d2deb4692f0b8 Mon Sep 17 00:00:00 2001
From: Nico Dietrich
Date: Tue, 4 Apr 2006 19:04:01 +0000
Subject: introduce vendor_pre&postinit; inst: only create new config_files
 when different; portmap in ubuntu

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@153 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/distro-specs/ubuntu/functions-5.10 | 6 ++++++
 initrd/initrd-stuff/init                  | 3 +++
 initrd/mkdxsinitrd                        | 9 ++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'initrd')

diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 4aa74e8f..75ade847 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -269,3 +269,9 @@ variable \${automnt_dir} appropriately in\n  machine-setup file." nonfatal
   rllinker "autofs" "18" "04"
 fi
 }
+
+# start portmapper (needed at least for nfs and nis services)
+config_portmap () {
+  rllinker "portmap" "02" "20"
+}
+
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 02133c30..bea32b4d 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -44,6 +44,8 @@ exec < /dev/console > /dev/console 2>&1
 
 # run pre init script
 preinit
+[ -x /bin/vendor_preinit ] && /bin/vendor_preinit
+
 # start device auto discovery service - distro specific function
 udev_hotplug
 # set defaults and create waitfor files
@@ -412,6 +414,7 @@ killall -9 dhcpcd dhclient pump 2>/dev/null
 
 # post init for some distro specific
 postinit
+[ -x /bin/vendor_postinit ] && /bin/vendor_postinit
 
 # start a debug shell in higher debug levels
 [ $DEBUGLEVEL -gt 2 ] && /bin/sh
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd
index 63903a51..0f56dc8c 100755
--- a/initrd/mkdxsinitrd
+++ b/initrd/mkdxsinitrd
@@ -479,7 +479,7 @@ done
 chmod 755 ${INSTDIR}/init \
   ${INSTDIR}/bin/{servconfig,hwautocfg,screenres,dhcpmkconfig}
 
-# finally add the common client configuration file
+# add the common client configuration file
 if [ -f /etc/dxs/client.cfg/machine-setup.default ] ; then
   cp /etc/dxs/client.cfg/machine-setup.default \
     ${INSTDIR}/etc/machine-setup
@@ -492,6 +492,13 @@ else
 disabled\nroot_pw='"'$1$T7VD/mmQ$aCP1WEaWplEsHe9khv4kK.'"'" > ${INSTDIR}/etc/machine-setup
 fi
 
+# finally copy vendor-supplied preinit and postinit files
+for i in vendor_preinit vendor_postinit ; do
+  if [ -f /etc/dxs/init.local/"${i}" ] ; then
+    cp /etc/dxs/init.local/"$i" ${INSTDIR}/bin/"$i"
+  fi
+done
+
 #########################################################################
 # End of file copy procedures
 
-- 
cgit v1.2.3-55-g7522