From e558e9a73ab2b493a43d287e762183f7e167b13a Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Wed, 26 Oct 2011 21:54:36 +0200
Subject: [PATCH] Some trivial fixes

---
 makedist.inc.sh             | 10 +++++-----
 platforms/sdk-root/Makefile |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/makedist.inc.sh b/makedist.inc.sh
index 9031280..30b24a1 100644
--- a/makedist.inc.sh
+++ b/makedist.inc.sh
@@ -88,7 +88,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 +104,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
 
diff --git a/platforms/sdk-root/Makefile b/platforms/sdk-root/Makefile
index 3970573..82d55cc 100644
--- a/platforms/sdk-root/Makefile
+++ b/platforms/sdk-root/Makefile
@@ -19,6 +19,6 @@ $(MAKEDIST_TARGET)-sdk-root-missing: wpa_supplicant dosfstools cups vim postplug
 $(MAKEDIST_TARGET)-sdk-root-en:
 $(MAKEDIST_TARGET)-sdk-root-it:
 $(MAKEDIST_TARGET)-sdk-root-es:
-$(MAKEDIST_TARGET)-sdk-root-i586: grub2
+$(MAKEDIST_TARGET)-sdk-root-i586: grub
 $(MAKEDIST_TARGET)-sdk-root-arm:
 $(MAKEDIST_TARGET)-sdk-root-ppc: yaboot