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 (from parent 1:
1fe036a
)
fix persistent host ssh identities and dpkg error
author
Ian Kelling
<ian@iankelling.org>
Sun, 15 Jan 2017 17:38:44 +0000
(09:38 -0800)
committer
Ian Kelling
<ian@iankelling.org>
Mon, 6 Feb 2017 06:21:42 +0000
(22:21 -0800)
fai/config/scripts/GRUB_PC/11-ian
patch
|
blob
|
history
diff --git
a/fai/config/scripts/GRUB_PC/11-ian
b/fai/config/scripts/GRUB_PC/11-ian
index 866cc6f3fc670933209a4bd92459c48e9c969876..6a55e4406455b436292444cba56a344a7705a23d 100755
(executable)
--- a/
fai/config/scripts/GRUB_PC/11-ian
+++ b/
fai/config/scripts/GRUB_PC/11-ian
@@
-38,25
+38,31
@@
EOFOUTER
exit 0
fi
exit 0
fi
-bind-common() {
- src=$1
- dst=$2
- if [[ ! -e $dst && -e $src ]]; then
- mkdir -p $dst
- mount -o bind $src $dst
- fi
-
-}
-bind-common $FAI/distro-install-common/shadow /q/root/shadow
+src=$FAI/distro-install-common/shadow
+dst=/q/root/shadow
+if [[ ! -e $dst && -e $src ]]; then
+ # outside of fai context, we skip this
+ mkdir -p $dst
+ mount -o bind $src $dst
+fi
# todo, port this over to the arch install script.
# todo, port this over to the arch install script.
-cp -rT $FAI/distro-install-common/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh /target/etc/ssh
+src=$FAI/distro-install-common/p/c/machine_specific/$HOSTNAME/filesystem/etc/ssh
+dst=/target/etc/ssh
+if [[ -e $src && -e $dst ]]; then
+ # outside of fai context, we skip this
+ cp -rT $src
+fi
$FAI/distro-install-common/end
# these get copied in an earlier stage by fai, but leaving it here since
# I run this as a single post-fai script to update things that have changed.
fcopy -riB /etc/apt
$FAI/distro-install-common/end
# these get copied in an earlier stage by fai, but leaving it here since
# I run this as a single post-fai script to update things that have changed.
fcopy -riB /etc/apt
+# outside of fai, this seems to regularly lead to
+# E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable)
+# so add a sleep. 1 sec is probably way more than needed.
+sleep 1
$ROOTCMD apt-get update
fcopy -riB /etc/ssh
$ROOTCMD apt-get update
fcopy -riB /etc/ssh