X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=zboot;h=2e98ecdfe7cdad96dcdcc25643fc41dacac7ceee;hb=refs%2Fheads%2Fmaster;hp=3a0a46a74b33be8da8b6ceb4e53b05db326b1966;hpb=12cab163424e3a7b0815646d1d4407f9b5839bcb;p=distro-setup

diff --git a/zboot b/zboot
index 3a0a46a..2e98ecd 100755
--- a/zboot
+++ b/zboot
@@ -1,9 +1,29 @@
 #!/bin/bash
+# I, Ian Kelling, follow the GNU license recommendations at
+# https://www.gnu.org/licenses/license-recommendations.en.html. They
+# recommend that small programs, < 300 lines, be licensed under the
+# Apache License 2.0. This file contains or is part of one or more small
+# programs. If a small program grows beyond 300 lines, I plan to switch
+# its license to GPL.
 
-script=$(readlink -f -- "$BASH_SOURCE")
-[[ $EUID == 0 ]] || exec sudo -E "$script" "$@"
+# Copyright 2024 Ian Kelling
 
-source /usr/local/lib/err
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
+
+set -e; . /usr/local/lib/bash-bear; set +e
 
 
 # Explaining this whole thing. The host amy is used by someone else,
@@ -19,6 +39,11 @@ source /usr/local/lib/err
 
 set -x
 
+if [[ ! -e /mnt/root/root2-fstab || ! -e /mnt/root/root2-crypttab ]]; then
+  echo $0: "error: create /mnt/root/root2-fstab & /mnt/root/root2-crypttab from running /a/bin/fai/fai/config/hooks/partition.DEFAULT mkroot2 or mkroot2tab"
+  exit 1
+fi
+
 mount -o bind /mnt/root2/root_ubuntubionic /mnt/1
 cd /mnt/1
 /b/ds/gen-amy-fstab ubuntubionic .
@@ -28,7 +53,7 @@ mount -o bind /dev dev
 mount -o bind /proc proc
 mount -o bind /sys sys
 mkdir -p boot/efi
-mount $(awk '$2 == "/boot/efi" {print $1}' /etc/mtab) boot/efi
+mount "$(awk '$2 == "/boot/efi" {print $1}' /etc/mtab)" boot/efi
 
 cp /b/ds/zboot-chroot ./root