bug fix

[automated-distro-installer] / mymk-basefile

diff --git a/mymk-basefile b/mymk-basefile
index d2b4328792fd3f53129c80dc6093f164e6cb796f..1f3266504eaac2a806dc26ca1f625b67fd5739eb 100755 (executable)
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -1,11 +1,30 @@
 #!/bin/bash
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
 
-x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
-script_dir="${x%/*}"
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+set -e; . /usr/local/lib/bash-bear; set +e
+
+this_file="$(readlink -f -- "${BASH_SOURCE[0]}")"
+readonly this_file this_dir="${this_file%/*}"
+cd "$this_dir"
 
 usage() {
-  cat <<EOF
-Usage: ${0##*/} [-h|--help] [mk-basefile_args]
+  cat <<'EOF'
+Usage: mymk-basefile [-h|--help] [mk-basefile_args]
 Wrap fai's mk-basefile so output dir is $BASEFILE_DIR if it exists.
 
 And fix things for trisquel. mk-basefile has a trisquel mirror added.
@@ -16,9 +35,14 @@ them often. Better to build our all our own.
 
 Args I've used before:
 
+-z BOOKWORM64
+-z BULLSEYE64
 -z BUSTER64
 -z STRETCH64
 -z XENIAL64
+
+-z ARAMO64
+-z NABIA64
 -z ETIONA64
 -z FLIDAS64
 -z BELENOS64
@@ -30,8 +54,8 @@ Note: Uses GNU getopt options parsing style.
 Usage of mk-basefile:
 
 EOF
-  $script_dir/fai/config/basefiles/mk-basefile -h
-  exit $1
+  $this_dir/fai/config/basefiles/mk-basefile -h
+  exit 0
 }
 
 case $1 in
@@ -59,4 +83,7 @@ if [[ $BASEFILE_DIR ]]; then
   cd $BASEFILE_DIR
 fi
 
-$s $script_dir/fai/config/basefiles/mk-basefile "$@"
+if awk '$2 == "/tmp" && $4 ~ /nodev/' /proc/mounts | grep -q . || [[ $? == 141 ]]; then
+  $s mount -o remount,dev /tmp
+fi
+$s $this_dir/fai/config/basefiles/mk-basefile "$@"