summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/install/install-functions12
-rwxr-xr-xscripts/install/install-image2
2 files changed, 14 insertions, 0 deletions
diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index d88df618..07f385fa 100755
--- a/scripts/install/install-functions
+++ b/scripts/install/install-functions
@@ -254,6 +254,18 @@ change_password() {
set_encrypted_password "$user" "$epwd" "$config"
}
+# returns true if it's a disk-based boot
+is_disk_based_boot()
+{
+ islive=`grep boot=live /proc/cmdline`
+ if [ -z "$islive" ]; then
+ # Return value 0 is "true" is shell
+ return 0
+ else
+ return 1
+ fi
+}
+
# returns true if it's a live cd boot
is_live_cd_boot ()
{
diff --git a/scripts/install/install-image b/scripts/install/install-image
index f717588b..607dcc98 100755
--- a/scripts/install/install-image
+++ b/scripts/install/install-image
@@ -207,6 +207,8 @@ fi
# check versions
if is_live_cd_boot; then
CURVER=LIVECD
+elif is_disk_based_boot; then
+ CURVER=DISK
else
CURVER=$(get_cur_version)
fi