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:
a8ec695
)
small fixes and config changes
author
Ian Kelling
<ian@iankelling.org>
Wed, 4 May 2016 07:08:42 +0000
(
00:08
-0700)
committer
Ian Kelling
<ian@iankelling.org>
Mon, 6 Feb 2017 06:21:41 +0000
(22:21 -0800)
arch-pxe
patch
|
blob
|
history
fai/config/class/50-host-classes
patch
|
blob
|
history
fai/config/distro-install-common/end
patch
|
blob
|
history
fai/config/hooks/partition.DEFAULT
patch
|
blob
|
history
fai/config/scripts/DEBIAN/30-interface
patch
|
blob
|
history
fai/config/scripts/GRUB_PC/11-ian
patch
|
blob
|
history
pxe-server
patch
|
blob
|
history
wrt-setup
patch
|
blob
|
history
diff --git
a/arch-pxe
b/arch-pxe
index 56e479094cf2a6525b4835baab4e04c7b2d5d9a8..7252f2da2ec3aa47d0402fdd06c07274123dccdf 100755
(executable)
--- a/
arch-pxe
+++ b/
arch-pxe
@@
-7,8
+7,7
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
cd /a/opt
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
cd /a/opt
-#iso="archlinux-2015.11.01-dual"
-iso="archlinux-2016.01.01-dual"
+iso="archlinux-2016.05.01-dual"
sfs=$iso/arch/x86_64/airootfs.sfs
rm -rf $iso
ex $iso.iso
sfs=$iso/arch/x86_64/airootfs.sfs
rm -rf $iso
ex $iso.iso
diff --git
a/fai/config/class/50-host-classes
b/fai/config/class/50-host-classes
index 9afbe912ed05c95fb734bcc595aec4040dc1b639..03bac3e91653a1f663c0851299773adb61445c48 100755
(executable)
--- a/
fai/config/class/50-host-classes
+++ b/
fai/config/class/50-host-classes
@@
-8,13
+8,15
@@
# use a list of classes for our demo machine
case $HOSTNAME in
demohost)
# use a list of classes for our demo machine
case $HOSTNAME in
demohost)
- echo "FAIBASE DEBIAN DESKTOP
STABLE
" ;;
+ echo "FAIBASE DEBIAN DESKTOP" ;;
x2)
echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
tp)
echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
frodo)
echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
x2)
echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
tp)
echo "FAIBASE DEBIAN DESKTOP PARTITION_PROMPT" ;;
frodo)
echo "FAIBASE DEBIAN DESKTOP STABLE PARTITION_PROMPT" ;;
+ treetowl)
+ echo "FAIBASE DEBIAN DESKTOP STABLE REPARTITION" ;;
# faiserver)
# echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
# xfcehost)
# faiserver)
# echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
# xfcehost)
diff --git
a/fai/config/distro-install-common/end
b/fai/config/distro-install-common/end
index 7d83b20e3c7c58ae3760fa45c6615b40623b577a..9c194fa19cc3cf90ee9889bd69809e6fee18e888 100755
(executable)
--- a/
fai/config/distro-install-common/end
+++ b/
fai/config/distro-install-common/end
@@
-38,6
+38,3
@@
while true; do
[[ $dir != /q ]] || break
done
[[ $dir != /q ]] || break
done
-# kvm is normally created by some package,
-# but unison doesn't like unknown groups, so make it now so initial sync works.
-$ROOTCMD groupadd -r kvm || [[ $? == 9 ]]
diff --git
a/fai/config/hooks/partition.DEFAULT
b/fai/config/hooks/partition.DEFAULT
index c2b73cbc5f63217d83bde84187428a32231cd669..fac3155a98e03cb3f08e25eb32f1f1d24b4f8bb5 100755
(executable)
--- a/
fai/config/hooks/partition.DEFAULT
+++ b/
fai/config/hooks/partition.DEFAULT
@@
-173,6
+173,12
@@
first_boot_dev=$(bootdev ${devs[0]})
# keyfiles generated like:
# head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost
luks_dir=${LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks}
# keyfiles generated like:
# head -c 2048 /dev/urandom | od | s dd of=/q/root/luks/host-demohost
luks_dir=${LUKS_DIR:-/var/lib/fai/config/distro-install-common/luks}
+
+if [[ ! -e $luks_dir/host-$HOSTNAME ]]; then
+ echo "$0: error: no key for hostname at $luks_dir/host-$HOSTNAME" >&2
+ exit 1
+fi
+
if ifclass tp; then
lukspw=$(cat $luks_dir/traci)
else
if ifclass tp; then
lukspw=$(cat $luks_dir/traci)
else
@@
-317,6
+323,13
@@
$first_root_crypt /home btrfs noatime,subvol=home_$DISTRO 0 0
$first_boot_dev /boot btrfs noatime,subvol=boot_$DISTRO 0 0
EOF
$first_boot_dev /boot btrfs noatime,subvol=boot_$DISTRO 0 0
EOF
+
+if ifclass treetowl; then
+ cat >> /tmp/fai/fstab <<'EOF'
+UUID=3f7b31cd-f299-40b4-a86b-7604282e2715 /i btrfs noatime 0 2
+EOF
+fi
+
swaps=()
for dev in ${devs[@]}; do
swaps+=(`swap-cryptname`)
swaps=()
for dev in ${devs[@]}; do
swaps+=(`swap-cryptname`)
diff --git
a/fai/config/scripts/DEBIAN/30-interface
b/fai/config/scripts/DEBIAN/30-interface
index 3388dcf1d241bcc2f01df100161d6e0e3ff154d7..12672f1ff4f7f18781c5e94e8038abb054383fe9 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/30-interface
+++ b/
fai/config/scripts/DEBIAN/30-interface
@@
-24,7
+24,7
@@
EOF
# you add some delay.
# http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
iface br0 inet dhcp
# you add some delay.
# http://wiki.libvirt.org/page/PXE_boot_%28or_dhcp%29_on_guest_failed
iface br0 inet dhcp
- bridge_ports
eth0
+ bridge_ports
$NIC1
bridge_stp off
bridge_maxwait 0
EOF
bridge_stp off
bridge_maxwait 0
EOF
diff --git
a/fai/config/scripts/GRUB_PC/11-ian
b/fai/config/scripts/GRUB_PC/11-ian
index bdfa275d85e424e7d9d1f505fc43654576a3a5f8..221b6d4da9277a9eb8a70dbef7df53052cc7570b 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-ian
+++ b/
fai/config/scripts/GRUB_PC/11-ian
@@
-37,7
+37,8
@@
chroot /target bash <<'EOF'
set -eE -o pipefail
chown -R 1000:1000 /home/ian/.ssh
chmod -R u=Xrw,og= /home/ian/.ssh
set -eE -o pipefail
chown -R 1000:1000 /home/ian/.ssh
chmod -R u=Xrw,og= /home/ian/.ssh
-cp -ar /home/ian/.ssh /root
+rm -rf /root/.ssh
+cp -rL /home/ian/.ssh /root
chown -R root:root /root/.ssh
# default jessie groups + kvm & systemd-journal
chown -R root:root /root/.ssh
# default jessie groups + kvm & systemd-journal
@@
-66,3
+67,8
@@
done
if ifclass frodo; then
$ROOTCMD usermod -p "$(cat /var/lib/fai/config/distro-install-common/shadow/traci-simple)" traci
fi
if ifclass frodo; then
$ROOTCMD usermod -p "$(cat /var/lib/fai/config/distro-install-common/shadow/traci-simple)" traci
fi
+
+
+# makes the journal be saved to disk.
+$ROOTCMD mkdir -p /target/var/log/journal
+$ROOTCMD chmod 755 /target/var/log/journal
diff --git
a/pxe-server
b/pxe-server
index 1664253761ae818d846d07521291214a0a42f64b..f53bdef0f5f35dd054519a06eac5c8b16be24964 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-15,7
+15,7
@@
fi
action=$1
arch() {
action=$1
arch() {
- default
+ plain-tftp
cat <<'EOF'
dhcp-option-force=209,boot/syslinux/archiso.cfg
dhcp-option-force=210,/arch/
cat <<'EOF'
dhcp-option-force=209,boot/syslinux/archiso.cfg
dhcp-option-force=210,/arch/
diff --git
a/wrt-setup
b/wrt-setup
index 2362a3313a3f8b36a5f56f373b398cb219c62aa7..1531c4f32f17c8c66fb45fe38f07d82addced723 100755
(executable)
--- a/
wrt-setup
+++ b/
wrt-setup
@@
-281,7
+281,7
@@
server=75.75.75.75
# sudo dhclient -r; sudo dhclient <interface-name>
# default dhcp range is 100-150
# sudo dhclient -r; sudo dhclient <interface-name>
# default dhcp range is 100-150
-dhcp-host=
f4:6d:04:02:ee:eb
,192.168.1.2,treetowl
+dhcp-host=
00:15:17:d2:1a:1c
,192.168.1.2,treetowl
dhcp-host=00:26:18:97:bb:16,192.168.1.3,frodo
dhcp-host=10:78:d2:da:29:22,192.168.1.4,htpc
dhcp-host=00:1f:16:16:39:24,192.168.1.5,x2
dhcp-host=00:26:18:97:bb:16,192.168.1.3,frodo
dhcp-host=10:78:d2:da:29:22,192.168.1.4,htpc
dhcp-host=00:1f:16:16:39:24,192.168.1.5,x2