From 7ea398ed600bc2c4d8a1d1487911f5db52f42c93 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 5 Jul 2011 21:21:50 -0400 Subject: lib-network: syntax cleanup quote where necessary and use bash syntax. Signed-off-by: Dave Reisner --- src/core/libs/lib-network.sh | 46 +++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh index 03d5361..5e8c5fc 100644 --- a/src/core/libs/lib-network.sh +++ b/src/core/libs/lib-network.sh @@ -8,52 +8,50 @@ target_configure_network() { # networking setup could have happened in a separate process (eg partial-configure-network), # so check if the settings file was created to be sure - if [ -f $RUNTIME_DIR/aif-network-settings ]; then + if [[ -f "$RUNTIME_DIR/aif-network-settings" ]]; then debug NETWORK "Configuring network settings on target system according to installer settings" - source $RUNTIME_DIR/aif-network-settings 2>/dev/null || return 1 + source "$RUNTIME_DIR/aif-network-settings" 2>/dev/null || return 1 IFO=${INTERFACE_PREV:-eth0} # old iface: a previously entered one, or the arch default IFN=${INTERFACE:-eth0} # new iface: a specified one, or the arch default # comment out any existing uncommented entries, whether specified by us, or arch defaults. - for var in eth0 $IFO INTERFACES gateway ROUTES - do - sed -i "s/^$var=/#$var=/" ${var_TARGET_DIR}/etc/rc.conf || return 1 + for var in eth0 $IFO INTERFACES gateway ROUTES; do + sed -i "s/^$var=/#$var=/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 done - sed -i "s/^nameserver/#nameserver/" ${var_TARGET_DIR}/etc/resolv.conf || return 1 - if [ -f ${var_TARGET_DIR}/etc/profile.d/proxy.sh ] + sed -i "s/^nameserver/#nameserver/" "${var_TARGET_DIR}/etc/resolv.conf" || return 1 + if [[ -f "${var_TARGET_DIR}/etc/profile.d/proxy.sh" ]] then - sed -i "s/^export/#export/" ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + sed -i "s/^export/#export/" "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi - if [ "$DHCP" = 0 ] ; then + if (( ! DHCP )); then local line="$IFN=\"$IFN ${IPADDR:-192.168.0.2} netmask ${SUBNET:-255.255.255.0} broadcast ${BROADCAST:-192.168.0.255}\"" - append_after_last "/$IFO\|eth0/" "$line" ${var_TARGET_DIR}/etc/rc.conf || return 1 + append_after_last "/$IFO\|eth0/" "$line" "${var_TARGET_DIR}/etc/rc.conf" || return 1 - if [ -n "$GW" ]; then - append_after_last "/gateway/" "gateway=\"default gw $GW\"" ${var_TARGET_DIR}/etc/rc.conf || return 1 - append_after_last "/ROUTES/" "ROUTES=(gateway)" ${var_TARGET_DIR}/etc/rc.conf || return 1 + if [[ $GW ]]; then + append_after_last "/gateway/" "gateway=\"default gw $GW\"" "${var_TARGET_DIR}/etc/rc.conf" || return 1 + append_after_last "/ROUTES/" "ROUTES=(gateway)" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi - if [ -n "$DNS" ] - then - echo "nameserver $DNS" >> ${var_TARGET_DIR}/etc/resolv.conf || return 1 + if [[ $DNS ]]; then + echo "nameserver $DNS" >> "${var_TARGET_DIR}/etc/resolv.conf" || return 2 fi else - append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" ${var_TARGET_DIR}/etc/rc.conf || return 1 + append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi - append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" ${var_TARGET_DIR}/etc/rc.conf || return 1 + append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" "${var_TARGET_DIR}/etc/rc.conf" || return 1 - if [ -n "$PROXY_HTTP" ]; then - echo "export http_proxy=$PROXY_HTTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + if [[ $PROXY_HTTP ]]; then + echo "export http_proxy=$PROXY_HTTP" >> "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 + chmod a+x "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi - if [ -n "$PROXY_FTP" ]; then - echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 - chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 + if [[ $PROXY_FTP ]]; then + echo "export ftp_proxy=$PROXY_FTP" >> "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 + chmod a+x "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi else debug NETWORK "Skipping Host Network Configuration - aif-network-settings not found" -- cgit v1.2.3 From 43a6e277b5b73a6141f2b222d0b826f1d37013d6 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 5 Jul 2011 21:33:35 -0400 Subject: lib-network: revamp for iproute2 syntax This is a vast simplification of the setup and doesn't insert default values since there's no "on/off" array as there was with the net-tools setup. If nothing is defined, its not added to the config. Signed-off-by: Dave Reisner --- src/core/libs/lib-network.sh | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh index 5e8c5fc..3e7914b 100644 --- a/src/core/libs/lib-network.sh +++ b/src/core/libs/lib-network.sh @@ -14,36 +14,30 @@ target_configure_network() source "$RUNTIME_DIR/aif-network-settings" 2>/dev/null || return 1 - IFO=${INTERFACE_PREV:-eth0} # old iface: a previously entered one, or the arch default IFN=${INTERFACE:-eth0} # new iface: a specified one, or the arch default - # comment out any existing uncommented entries, whether specified by us, or arch defaults. - for var in eth0 $IFO INTERFACES gateway ROUTES; do - sed -i "s/^$var=/#$var=/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 - done sed -i "s/^nameserver/#nameserver/" "${var_TARGET_DIR}/etc/resolv.conf" || return 1 - if [[ -f "${var_TARGET_DIR}/etc/profile.d/proxy.sh" ]] - then + if [[ -f "${var_TARGET_DIR}/etc/profile.d/proxy.sh" ]]; then sed -i "s/^export/#export/" "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 fi + sed -i "s/^\(interface\)=/\1=$IFN/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 if (( ! DHCP )); then - local line="$IFN=\"$IFN ${IPADDR:-192.168.0.2} netmask ${SUBNET:-255.255.255.0} broadcast ${BROADCAST:-192.168.0.255}\"" - append_after_last "/$IFO\|eth0/" "$line" "${var_TARGET_DIR}/etc/rc.conf" || return 1 + sed -i "s/^\(address\)=/\1=$IPADDR/;s/^\(netmask\)=/\1=$SUBNET/" "${var_TARGET_DIR}/etc/rc.conf" + + if [[ $BROADCAST ]]; then + sed -i "s/^\(broadcast\)=/\1=$BROADCAST/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 + fi if [[ $GW ]]; then - append_after_last "/gateway/" "gateway=\"default gw $GW\"" "${var_TARGET_DIR}/etc/rc.conf" || return 1 - append_after_last "/ROUTES/" "ROUTES=(gateway)" "${var_TARGET_DIR}/etc/rc.conf" || return 1 + sed -i "s/^\(gateway\)=/\1=$GW/" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi + if [[ $DNS ]]; then echo "nameserver $DNS" >> "${var_TARGET_DIR}/etc/resolv.conf" || return 2 fi - else - append_after_last "/$IFO\|eth0/" "$IFN=\"dhcp\"" "${var_TARGET_DIR}/etc/rc.conf" || return 1 fi - append_after_last "/$IFO\|eth0/" "INTERFACES=($IFN)" "${var_TARGET_DIR}/etc/rc.conf" || return 1 - if [[ $PROXY_HTTP ]]; then echo "export http_proxy=$PROXY_HTTP" >> "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 chmod a+x "${var_TARGET_DIR}/etc/profile.d/proxy.sh" || return 1 -- cgit v1.2.3 From e39b5f055011a12890988b768b0329990c79f964 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 24 Jul 2011 16:12:31 -0400 Subject: fix references to kernel26.img and vmlinuz26 Signed-off-by: Dave Reisner --- src/core/libs/lib-software.sh | 2 +- src/core/libs/lib-ui-interactive.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh index bb84621..d93cfad 100644 --- a/src/core/libs/lib-software.sh +++ b/src/core/libs/lib-software.sh @@ -8,7 +8,7 @@ target_run_mkinitcpio() { target_special_fs on - run_controlled mkinitcpio "chroot $var_TARGET_DIR /sbin/mkinitcpio -p kernel26" $TMP_MKINITCPIO_LOG "Rebuilding initcpio images ..." + run_controlled mkinitcpio "chroot $var_TARGET_DIR /sbin/mkinitcpio -p linux" $TMP_MKINITCPIO_LOG "Rebuilding initcpio images ..." target_special_fs off diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 8281bc0..93f89d6 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1073,14 +1073,14 @@ generate_grub_menulst() { # (0) Arch Linux title Arch Linux root $grubdev -kernel $subdir/vmlinuz26 $kernel_parameters -initrd $subdir/kernel26.img +kernel $subdir/vmlinuz-linux $kernel_parameters +initrd $subdir/initramfs-linux.img # (1) Arch Linux title Arch Linux Fallback root $grubdev -kernel $subdir/vmlinuz26 $kernel_parameters -initrd $subdir/kernel26-fallback.img +kernel $subdir/vmlinuz-linux $kernel_parameters +initrd $subdir/initramfs-linux-fallback.img # (2) Windows #title Windows -- cgit v1.2.3