Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[archiso] Unify ->

Browse Source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-10-12 14:40:19 -03:00
parent 1dcf439c30
commit bfef0bc1eb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archiso/hooks/archiso_pxe_nbd
View File

@ -8,10 +8,10 @@ run_hook () {
if [ -n "${BOOTIF}" ]; then if [ -n "${BOOTIF}" ]; then
bootif_mac=${BOOTIF#01-} bootif_mac=${BOOTIF#01-}
bootif_mac=${bootif_mac//-/:} 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#/sys/class/net/}
bootif_dev=${bootif_dev%/address} bootif_dev=${bootif_dev%/address}
ip="$ip::$bootif_dev" ip="${ip}::${bootif_dev}"
fi fi
# setup network and save some values # setup network and save some values

2
configs/baseline/build.sh
View File

@ -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" 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" verbose="-v"
else else
verbose="" verbose=""

10
configs/releng/root-image/etc/rc.d/functions.d/automated_script
View File

@ -1,16 +1,16 @@
automated_script () automated_script ()
{ {
script="$(kernel_cmdline script)" script="$(kernel_cmdline script)"
if [[ -n "$script" ]]; then if [[ -n "${script}" ]]; then
stat_busy "Configuring $script" stat_busy "Configuring $script"
if [[ "$script" =~ ^http:// || "$script" =~ ^ftp:// ]]; then if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then
wget "$script" -q -O /tmp/startup_script >/dev/null wget "${script}" -q -O /tmp/startup_script >/dev/null
rt=$? rt=$?
else else
cp "$script" /tmp/startup_script cp "${script}" /tmp/startup_script
rt=$? rt=$?
fi fi
if [ $rt -eq 0 ]; then if [ ${rt} -eq 0 ]; then
chmod +x /tmp/startup_script chmod +x /tmp/startup_script
echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.bash_profile echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.bash_profile
stat_done stat_done