iankelling.org
/
git
/
automated-distro-installer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
efcfb46
)
minor fixes
author
Ian Kelling
<iank@fsf.org>
Wed, 9 Aug 2017 00:06:49 +0000
(17:06 -0700)
committer
Ian Kelling
<iank@fsf.org>
Wed, 9 Aug 2017 00:06:49 +0000
(17:06 -0700)
fai-revm
patch
|
blob
|
history
wrt-setup
patch
|
blob
|
history
diff --git
a/fai-revm
b/fai-revm
index 68840bd9d962c1c3cac9570464796f8a4f64dc3a..4009ede6e37a081ab7da6d631dd25c69da5534e1 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-44,6
+44,7
@@
EOF
exit $1
}
exit $1
}
+orig_args=("$@")
new_disk=false
temp=$(getopt -l help hnr "$@") || usage 1
eval set -- "$temp"
new_disk=false
temp=$(getopt -l help hnr "$@") || usage 1
eval set -- "$temp"
@@
-57,7
+58,6
@@
while true; do
esac
done
esac
done
-
# change this to test different disk counts. 1 and > 1 should be the only
# important things to test.
disk_count=1
# change this to test different disk counts. 1 and > 1 should be the only
# important things to test.
disk_count=1
@@
-69,7
+69,7
@@
if [[ $script_dir == /a/bin/* ]]; then
rm -rf /tmp/faifreeze
mkdir -p /a/tmp
cp -ar /a/bin/fai /tmp/faifreeze
rm -rf /tmp/faifreeze
mkdir -p /a/tmp
cp -ar /a/bin/fai /tmp/faifreeze
- exec /tmp/faifreeze/${BASH_SOURCE##*/} "$
@
"
+ exec /tmp/faifreeze/${BASH_SOURCE##*/} "$
{orig_args[@]}
"
fi
cd $script_dir
fi
cd $script_dir
@@
-108,7
+108,7
@@
for ((i=1; i <= disk_count; i++)); do
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
s rm -f $f
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
s rm -f $f
- e s qemu-img create -o preallocation=metadata -f qcow2 $f
2
0G
+ e s qemu-img create -o preallocation=metadata -f qcow2 $f
5
0G
fi
done
fi
done
diff --git
a/wrt-setup
b/wrt-setup
index 86e82cfd128c78beb2cad792db041b3bb5f07ec0..6fe2168f23e6ea69b38d8bc98b41752b37c97c15 100755
(executable)
--- a/
wrt-setup
+++ b/
wrt-setup
@@
-331,7
+331,7
@@
EOF
dnsmasq_restart=false
v cedit /etc/hosts <<EOF || dnsmasq_restart=true
192.168.1.1 wrt
dnsmasq_restart=false
v cedit /etc/hosts <<EOF || dnsmasq_restart=true
192.168.1.1 wrt
-192.168.1.2 treetowl
mail.iankelling.org
$HOME_DOMAIN faiserver
+192.168.1.2 treetowl $HOME_DOMAIN faiserver
192.168.1.3 frodo
192.168.1.4 htpc
192.168.1.5 x2
192.168.1.3 frodo
192.168.1.4 htpc
192.168.1.5 x2