From 4f642eba4c1342f60b09308c9b52b32cbb3b628b Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 30 Oct 2011 21:55:46 +0100
Subject: [PATCH] makedist.sh: backport latest changes from openmamba target

---
 makedist.inc.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index 9031280..d3f7f35 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -13,7 +13,6 @@
 
 create_rpm_database
 create_devices
-create_fstab "$ROOTDEV" "$ROOTFS"
 
 install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig libattr libstdc++6" "--nodeps --noorder --noscripts"
 
@@ -88,7 +87,7 @@ sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $TARGET_HOSTNAME.$TARGET_DOMAIN $TARGET_H
 install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
 
 [ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}"
-[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
+[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
 
 if [ ! "$KERNEL_IGNORE" ]; then
    for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
@@ -104,11 +103,11 @@ fi
 
 if [ ${DEBUG:-0} -gt 0 ]; then
    install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}"
-   cat > $MOUNTDIR/etc/sysconfig/network-devices/ifconfig.eth0 << _EOF
-IF=eth0
-ONBOOT=yes
-ZONE=local
+   cat > $MOUNTDIR/etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF
+DEVICE=eth0
 BOOTPROTO=dhcp
+ONBOOT=yes
+#NM_CONTROLLED=no
 _EOF
 fi