Commit 4f642eba4c1342f60b09308c9b52b32cbb3b628b

Authored by Silvan Calarco
1 parent 3862a7af5f
Exists in master

makedist.sh: backport latest changes from openmamba target

Showing 1 changed file with 5 additions and 6 deletions Side-by-side Diff

... ... @@ -13,7 +13,6 @@
13 13  
14 14 create_rpm_database
15 15 create_devices
16   -create_fstab "$ROOTDEV" "$ROOTFS"
17 16  
18 17 install_rpms "filesystem gzip texinfo ldconfig bash libreadline glibc libncurses initscripts setup coreutils chkconfig libattr libstdc++6" "--nodeps --noorder --noscripts"
19 18  
... ... @@ -88,7 +87,7 @@
88 87 install_rpms_by_target "Installing ${PLATFORM} platform packages" ${MAKEDIST_TARGET}-${PLATFORM} "${RPMEXTRAARGS}"
89 88  
90 89 [ "$LANGUAGE" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for language $LANGUAGE" ${MAKEDIST_TARGET}-${PLATFORM}-${LANGUAGE} "${RPMEXTRAARGS}"
91   -[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform localization packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
  90 +[ "$ARCH" ] && install_rpms_by_target "Installing ${PLATFORM} platform packages for arch $ARCH" ${MAKEDIST_TARGET}-${PLATFORM}-${ARCH} "${RPMEXTRAARGS}"
92 91  
93 92 if [ ! "$KERNEL_IGNORE" ]; then
94 93 for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
95 94  
... ... @@ -104,11 +103,11 @@
104 103  
105 104 if [ ${DEBUG:-0} -gt 0 ]; then
106 105 install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}"
107   - cat > $MOUNTDIR/etc/sysconfig/network-devices/ifconfig.eth0 << _EOF
108   -IF=eth0
109   -ONBOOT=yes
110   -ZONE=local
  106 + cat > $MOUNTDIR/etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF
  107 +DEVICE=eth0
111 108 BOOTPROTO=dhcp
  109 +ONBOOT=yes
  110 +#NM_CONTROLLED=no
112 111 _EOF
113 112 fi
114 113