From 8f894d093f24a799124b559cfce221c073c005cf Mon Sep 17 00:00:00 2001
From: Felix Endres
Date: Thu, 20 Jul 2006 17:24:52 +0000
Subject: Abgleich wg alter konflikte

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@282 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/distro-specs/ubuntu/functions-5.10 | 5 -----
 initrd/initrd-stuff/etc/functions         | 2 +-
 installer/ld4-inst                        | 4 +++-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 925b25a7..84cc1eff 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -11,7 +11,6 @@
 # 
 # Version:      0.3.0b
 
-<<<<<<< .mine
 # distro specific stuff to initialize
 preinit () {
   echo "Creating dhcp user"
@@ -172,7 +171,6 @@ consolefont () {
 echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
 }
-"20" "02"
 # acpi and powersave
 config_acpi () {
   rllinker "acpid" "02" "19"
@@ -404,6 +402,3 @@ config_portmap () {
 config_nis () {
   rllinker "ypbind" "06" "16"
 }
-=======
-# nothing changed from default yet
->>>>>>> .r256
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 06fe9e3d..e354c2ce 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -135,7 +135,7 @@ local n=0
     case $i in
         0) break ;;
       128) n=`expr $n + 1` ; break ;;
-      192) n=`expr $n + 1` ; break ;;
+      192) n=`expr $n + 2` ; break ;;
       224) n=`expr $n + 3` ; break ;;
       240) n=`expr $n + 4` ; break ;;
       252) n=`expr $n + 6` ; break ;;
diff --git a/installer/ld4-inst b/installer/ld4-inst
index c4b95ae0..f0b447a1 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -373,6 +373,7 @@ kernel_choice "${kernel_choice}"
     echo "Creating initial ramdisk for ${current_kernel}"
     current_initrd=${tftpbootdir}/initrd-dxs-${current_kernel}
     [ -f ${current_initrd} ] && rm ${current_initrd}
+    echo "mkdxsinitrd -f \"$fsmod\" -r ${rootdir} -k ${current_kernel} -i ${current_initrd} -d ${debuglevel}"
     ./mkdxsinitrd -f "$fsmod" -r ${rootdir} -k ${current_kernel} \
       -i ${current_initrd} -d ${debuglevel}
 
@@ -537,7 +538,8 @@ dxs_client_conf="client.cfg/machine-setup.default"
 header
 precheck #(run as root, rsync etc.)
 configure
-copy_system
+#do not sync if "-o" was specified
+[ "$1" = "-o" ] || copy_system
 create_nbd
 create_initrd
 setup_server
-- 
cgit v1.2.3-55-g7522