summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-01-11 17:35:57 +0100
committerHolger Levsen <holger@layer-acht.org>2013-01-11 17:35:57 +0100
commit172cb637afff9c847362763d40cd126091c71198 (patch)
treed1259a5550bb3b533ef784226babab1ce36cb9c0 /bin
parent09992e92e56cc9047eb7ffa4426dcd976adb8f88 (diff)
downloadjenkins.debian.net-172cb637afff9c847362763d40cd126091c71198.tar.xz
g-i: preserve /etc/fstab and for combi-servers, also mount /usr
Diffstat (limited to 'bin')
-rwxr-xr-xbin/g-i-installation.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 33570b2c..321b1759 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -603,6 +603,10 @@ save_logs() {
case $NAME in
debian-edu_*_workstation) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" )
;;
+ debian-edu_*_combi-server) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" )
+ sudo guestmount -a $NAME.raw -m /dev/vg_system/var -o nonempty --ro $SYSTEM_MNT/var || ( echo "Warning: cannot mount /dev/vg_system/var" ; figlet "fail" )
+ sudo guestmount -a $NAME.raw -m /dev/vg_system/usr -o nonempty --ro $SYSTEM_MNT/usr || ( echo "Warning: cannot mount /dev/vg_system/usr" ; figlet "fail" )
+ ;;
debian-edu_*) sudo guestmount -a $NAME.raw -m /dev/vg_system/root --ro $SYSTEM_MNT || ( echo "Warning: cannot mount /dev/vg_system/root" ; figlet "fail" )
sudo guestmount -a $NAME.raw -m /dev/vg_system/var -o nonempty --ro $SYSTEM_MNT/var || ( echo "Warning: cannot mount /dev/vg_system/var" ; figlet "fail" )
;;
@@ -614,7 +618,7 @@ save_logs() {
#
set +e
mkdir -p $RESULTS/log
- sudo cp -r $SYSTEM_MNT/var/log/installer $RESULTS/log/
+ sudo cp -r $SYSTEM_MNT/var/log/installer $SYSTEM_MNT/etc/fstab $RESULTS/log/
sudo chown -R jenkins:jenkins $RESULTS/log/
#
# get list of installed packages
@@ -626,6 +630,9 @@ save_logs() {
sync
case $NAME in
debian-edu_*_workstation) ;;
+ debian-edu_*_combi-server) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" )
+ sudo umount -l $SYSTEM_MNT/usr || ( echo "Warning: cannot un-mount $SYSTEM_MNT/usr" ; figlet "fail" )
+ ;;
debian-edu_*) sudo umount -l $SYSTEM_MNT/var || ( echo "Warning: cannot un-mount $SYSTEM_MNT/var" ; figlet "fail" )
;;
*) ;;