diff options
| -rw-r--r-- | archiso/hooks/archiso_pxe_nbd | 4 | ||||
| -rwxr-xr-x | configs/baseline/build.sh | 2 | ||||
| -rw-r--r-- | configs/releng/root-image/etc/rc.d/functions.d/automated_script | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/archiso/hooks/archiso_pxe_nbd b/archiso/hooks/archiso_pxe_nbd index e3e27e7..cc21c2b 100644 --- a/archiso/hooks/archiso_pxe_nbd +++ b/archiso/hooks/archiso_pxe_nbd @@ -8,10 +8,10 @@ run_hook () { if [ -n "${BOOTIF}" ]; then bootif_mac=${BOOTIF#01-} bootif_mac=${bootif_mac//-/:} - bootif_dev=$(grep -l $bootif_mac /sys/class/net/*/address) + bootif_dev=$(grep -l ${bootif_mac} /sys/class/net/*/address) bootif_dev=${bootif_dev#/sys/class/net/} bootif_dev=${bootif_dev%/address} - ip="$ip::$bootif_dev" + ip="${ip}::${bootif_dev}" fi # setup network and save some values diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh index b7d2b7b..ab7a88e 100755 --- a/configs/baseline/build.sh +++ b/configs/baseline/build.sh @@ -84,7 +84,7 @@ make_iso() { mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-${arch}.iso" } -if [[ $verbose == "y" ]]; then +if [[ ${verbose} == "y" ]]; then verbose="-v" else verbose="" diff --git a/configs/releng/root-image/etc/rc.d/functions.d/automated_script b/configs/releng/root-image/etc/rc.d/functions.d/automated_script index 7a35acb..b89ad9e 100644 --- a/configs/releng/root-image/etc/rc.d/functions.d/automated_script +++ b/configs/releng/root-image/etc/rc.d/functions.d/automated_script @@ -1,16 +1,16 @@ automated_script () { script="$(kernel_cmdline script)" - if [[ -n "$script" ]]; then + if [[ -n "${script}" ]]; then stat_busy "Configuring $script" - if [[ "$script" =~ ^http:// || "$script" =~ ^ftp:// ]]; then - wget "$script" -q -O /tmp/startup_script >/dev/null + if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then + wget "${script}" -q -O /tmp/startup_script >/dev/null rt=$? else - cp "$script" /tmp/startup_script + cp "${script}" /tmp/startup_script rt=$? fi - if [ $rt -eq 0 ]; then + if [ ${rt} -eq 0 ]; then chmod +x /tmp/startup_script echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.bash_profile stat_done |