Commit da19a0cf authored by fsmithred's avatar fsmithred

Removed 'keep home'

parent 52c18611
refractainstaller-gui (9.5.3) unstable; urgency=low
* Fix message for bios boot with grub-pc installed.
* Remove option to keep old home.
-- fsmithred <fsmithred@gmail.com> Sun, 17 Mar 2019 12:20:00 -0700
refractainstaller-gui (9.5.2) unstable; urgency=low
* Remove null column from yad partition/drive lists.
......
......@@ -21,9 +21,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
util-linux (>=2.17.2),
gparted (>=0.7.0),
yad ( >=0.17.1.1),
refractainstaller-base (>= 9.5.2),
refractainstaller-base (>= 9.5.3),
xterm
Replaces: refractainstaller (<< 9.0.0), refractainstaller-gui (<< 9.5.2)
Replaces: refractainstaller (<< 9.0.0), refractainstaller-gui (<< 9.5.3)
Description: tool to install a running live-CD to hard drive.
Refracta Installer installs a live-CD or live-usb-hdd, including any
changes you've made to the running system onto a hard drive. This is
......
#!/usr/bin/env bash
version="Refracta UEFI/BIOS Installer (Yad) 9.5.2 (20190222)"
version="Refracta UEFI/BIOS Installer (Yad) 9.5.3 (20190317)"
TEXTDOMAIN=refractainstaller-gui
TEXTDOMAINDIR=/usr/share/locale/
......@@ -380,6 +380,10 @@ If you have the grub-pc deb packages, you will be given a chance to install them
${grub_package_message}
${grub_debs}
"
elif [[ "$grubversion" =~ "grub-pc" ]] ; then
grub_efi_warning=$"Boot method: bios
GRUB version: grub-pc (for bios boot)
If this is not what you want, exit and examine the situation."
fi
yad --title=$"$window_title" --width=480 --button=$"Help":0 \
--button=$"Continue":1 --button=$"Abort":2 --center --borders=10 \
......@@ -436,7 +440,6 @@ If you don't understand an option, you probably don't need it.\n" \
--checklist --column $"Choose" --column "":HD --column $"Option" \
--width=590 --height=555 --button=$"OK":0 --button=$"Exit":1\
FALSE 01 $"Create a new, separate /home partition" \
FALSE 08 $"EXPERIMENTAL: Use an existing /home partition. (Keep old files)" \
FALSE 02 $"Create a separate /boot partition" \
$var3 03 $"Use existing swap partition instead of swapfile." \
FALSE 04 $"Encrypt the root filesystem (with or without separate /boot)" \
......@@ -461,11 +464,11 @@ fi
if $(echo $opts | grep -q 01); then
sep_home="yes"
fi
if $(echo $opts | grep -q 08); then
sep_home="yes"
keep_old_home="yes"
old_home_message=$"Existing /home partition will be used; old files will be preserved."
fi
#if $(echo $opts | grep -q 08); then
# sep_home="yes"
# keep_old_home="yes"
# old_home_message=$"Existing /home partition will be used; old files will be preserved."
#fi
if $(echo $opts | grep -q 02); then
sep_boot="yes"
fi
......@@ -476,11 +479,11 @@ if $(echo $opts | grep -q 04); then
encrypt_os="yes"
fi
if $(echo $opts | grep -q 05); then
if [[ -z $keep_old_home ]] ; then
# if [[ -z $keep_old_home ]] ; then
encrypt_home="yes"
else
old_home_message=$"Existing /home will not be encrypted; old files will be preserved."
fi
# else
# old_home_message=$"Existing /home will not be encrypted; old files will be preserved."
# fi
fi
if $(echo $opts | grep -q 06); then
write_random="yes"
......@@ -488,11 +491,6 @@ fi
if $(echo $opts | grep -q 07); then
write_zero="yes"
fi
#if $(echo $opts | grep -q 08); then
# bootloader="no"
#else
# bootloader="yes"
#fi
if $(echo $opts | grep -q 09); then
if [[ $encrypt_os = "yes" ]] || [[ $encrypt_home = "yes" ]]; then
no_format=""
......@@ -945,9 +943,10 @@ fi
}
if [[ -n $home_dev ]]; then
if [[ $no_format = "yes" ]] || [[ $keep_old_home = "yes" ]] ; then
if [[ $no_format = "yes" ]] ; then #|| [[ $keep_old_home = "yes" ]] ; then
fs_type_home=$(blkid -s TYPE "$home_dev" | awk -F"\"" '{ print $2 }')
elif [[ -z $keep_old_home ]] ; then
# elif [[ -z $keep_old_home ]] ; then
else
choose_fs_home
fi
fi
......@@ -1193,7 +1192,7 @@ fi
if [[ $write_zero = "yes" ]]; then
dd if=/dev/zero of="$install_dev"
if [[ $sep_home = "yes" ]] && [[ -z $keep_old_home ]] ; then
if [[ $sep_home = "yes" ]] ; then #&& [[ -z $keep_old_home ]] ; then
exec 2>&1
dd if=/dev/zero of="$home_dev"
exec 2>>"$error_log"
......@@ -1271,12 +1270,12 @@ if [[ -n $home_dev ]]; then
else
home_part=$home_dev
fi
if [[ $no_format != "yes" ]] && [[ -z $keep_old_home ]] ; then
if [[ $no_format != "yes" ]] ; then #&& [[ -z $keep_old_home ]] ; then
mke2fs -t $fs_type_home "$home_part" # ; check_exit
fi
if [[ -z $keep_old_home ]] ; then
mount "$home_part" /target_home ; check_exit
fi
# if [[ -z $keep_old_home ]] ; then
mount "$home_part" /target_home ; check_exit
# fi
sep_home_opt="--exclude=/home/*"
fi
......@@ -1304,7 +1303,7 @@ tee >(yad --progress --pulsate --width=350 --auto-close --title=$"Copying system
# copy separate /home if needed
if [[ -n $home_dev ]] && [[ -z $keep_old_home ]] ; then
if [[ -n $home_dev ]] ; then #&& [[ -z $keep_old_home ]] ; then
rsync -av /home/ /target_home/ --filter='P lost+found' --filter='H lost+found' --exclude-from="$home_boot_excludes" | \
tee >(yad --progress --pulsate --width=350 --auto-close --title=$"Copying home folders to new partition.")
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment