iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix arch install with new partition scheme
[automated-distro-installer]
/
fai-revm
diff --git
a/fai-revm
b/fai-revm
index d9bacf4d48be6592eba0e2a7d0a03256bf9e1566..3b1b514a3b662eaf0eb0e37a12171f0ef8dfe9c1 100755
(executable)
--- a/
fai-revm
+++ b/
fai-revm
@@
-9,24
+9,22
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
-disk_count=
4
+disk_count=
2
script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
if [[ $script_dir == /a/bin/* ]]; then
rm -rf /a/tmp/fai2
script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
if [[ $script_dir == /a/bin/* ]]; then
rm -rf /a/tmp/fai2
- cp -r /a/bin/fai /a/tmp/fai2
- exec /a/tmp/fai2/
fai-revm
"$@"
+ cp -
a
r /a/bin/fai /a/tmp/fai2
+ exec /a/tmp/fai2/
${BASH_SOURCE##*/}
"$@"
fi
fi
-cd $
(dirname $(readlink -f "$BASH_SOURCE"))
+cd $
script_dir
new_disk=false
[[ ! $1 ]] || new_disk=true
new_disk=false
[[ ! $1 ]] || new_disk=true
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
-
if [[ $0 == *arch-revm ]]; then
# via osinfo-query os. guessing arch is closest to latest fedora.
variant=fedora22
if [[ $0 == *arch-revm ]]; then
# via osinfo-query os. guessing arch is closest to latest fedora.
variant=fedora22