openmamba/makedist-openmamba-milestone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

makedist.sh: backport latest changes from openmamba target

Browse Source
This commit is contained in:
Silvan Calarco 2011-10-30 21:55:46 +01:00
parent 3862a7af5f
commit 4f642eba4c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
makedist.inc.sh
View File

@ -13,7 +13,6 @@
create_rpm_database create_rpm_database
create_devices 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" 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}" 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}" [ "$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 if [ ! "$KERNEL_IGNORE" ]; then
for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do for K in $KERNEL_EXTRAVER $KERNEL_MORE_EXTRAVER; do
@ -104,11 +103,11 @@ fi
if [ ${DEBUG:-0} -gt 0 ]; then if [ ${DEBUG:-0} -gt 0 ]; then
install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}" install_rpms_by_target "Installing debugging packages." ${MAKEDIST_TARGET}-debug "${RPMEXTRAARGS}"
cat > $MOUNTDIR/etc/sysconfig/network-devices/ifconfig.eth0 << _EOF cat > $MOUNTDIR/etc/sysconfig/network-scripts/ifcfg-eth0 << _EOF
IF=eth0 DEVICE=eth0
ONBOOT=yes
ZONE=local
BOOTPROTO=dhcp BOOTPROTO=dhcp
ONBOOT=yes
#NM_CONTROLLED=no
_EOF _EOF
fi fi