Commit 6deee211 authored by fsmithred's avatar fsmithred

9.3.3 fixes two bugs

parent 35b9c1fd
refractainstaller-base (9.3.3) unstable; urgency=low
* select_grub_dev if grub-pc is copied to /target and installed.
* Include preliminary (partial) German translation file.
-- fsmithred <fsmithred@gmail.com> Sat, 30 Dec 2017 20:50:00 -0500
refractainstaller-base (9.3.2) unstable; urgency=low
* Fixed disable autologin when sudo is default.
-- fsmithred <fsmithred@gmail.com> Sun, 17 Dec 2017 08:45:00 -0500
refractainstaller-base (9.3.1) unstable; urgency=medium
* creating suite suites/ascii
-- fsmithred <fsmithred@gmail.com> Thu, 14 Dec 2017 09:06:37 -0500
refractainstaller-base (9.3.1) unstable; urgency=low
* Changed y/n answers to numeric for easier translations.
......
......@@ -18,7 +18,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
mount (>=2.17.2),
util-linux (>=2.17.2)
Recommends: cryptsetup, grub-pc | grub-legacy | grub-efi-amd64
Replaces: refractainstaller (<< 9.0.8), refractainstaller-base (<< 9.3.0)
Replaces: refractainstaller (<< 9.0.8), refractainstaller-base (<< 9.3.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
......
......@@ -7,3 +7,6 @@ refractainstaller.conf etc
loc-timezn.sh usr/lib/refractainstaller/pre-install
cleanup-install.sh usr/lib/refractainstaller/post-install
move-dir-mount.sh usr/lib/refractainstaller
refractainstaller-base.pot usr/lib/refractainstaller
de.po usr/lib/refractainstaller
locales/de/refractainstaller-base.mo usr/share/locale/de/LC_MESSAGES
......@@ -20,7 +20,7 @@ echo -n $"
Enter the directory you want to move to another partition.
Do not use a trailing slash.
(examples: /var or /usr
"
"
read source_dir
if [[ -z "$source_dir" ]] ; then
......@@ -38,7 +38,7 @@ echo -n $"
Enter the destination partition for /${source_dir##*/}.
(example: /dev/sdb3)
"
"
read destination_partition
if [[ -z "$destination_partition" ]] ; then
......
#!/usr/bin/env bash
version="refractainstaller 9.3.1 (20171105)"
version="refractainstaller 9.3.3 (20171230)"
. gettext.sh
TEXTDOMAIN=refractainstaller-base
......@@ -47,7 +47,7 @@ help_text=$"
-h, --help show this help text
-v, --version display the version information
-d. --debug debug mode
"
while [[ $1 == -* ]]; do
......@@ -156,7 +156,7 @@ if ! [[ -f $rsync_excludes ]] ; then
read -p " "
rsync_excludes="$(pwd)/installer_exclude.list"
echo $" Creating rsync excludes file, $rsync_excludes
"
"
sleep 2
cat > "$rsync_excludes" <<EOF
# It is safe to delete this file after installation.
......@@ -251,7 +251,7 @@ if [[ -d /sys/firmware/efi ]]; then
fi
fi
if ! [[ "$grubversion" =~ grub-efi ]] ; then
if ! [[ "$grubversion" =~ grub-efi ]] ; then # grub-efi-${grub_arch}*.deb to include grub-efi-ia32
grub_package="grub-efi*.deb" # make sep vars for grub-x and grub-x-bin. Maybe sep. messages. Or sep. dirs?
grub_debs=$(ls "$grub_package_dir"/${grub_package}) # don't quote $grub_package here.
if [[ -n "$grub_debs" ]] ; then
......@@ -284,7 +284,7 @@ ${grub_debs}
1) Help
2) Continue
3) Abort the installation
"
"
read ans
case "$ans" in
1) show_uefi_help ; break ;;
......@@ -334,7 +334,7 @@ ${grub_debs}
1) Continue
2) Abort the installation
"
"
read ans
case "$ans" in
1) break ;;
......@@ -367,7 +367,7 @@ while true; do
2. $cli_partition_tool
3. No thanks, I already have a partition prepared. Continue.
4. I'd like to exit the script now.
"
"
read ans
case $ans in
1) if ! [[ -f /usr/sbin/gparted ]]; then
......@@ -445,7 +445,7 @@ ask_format_efi () {
2) No, proceed without a bootloader.
3) Abort the install to investigate the situation.
Format new efi partition? (y/n/x): "
Format new efi partition?: "
read ans
case "$ans" in
......@@ -510,7 +510,7 @@ select_grub_dev () {
If you don't want to install the bootloader, leave this blank.
You will need to do some manual configuration after the install.:
"
"
read grub_dev
if [[ -n $grub_dev ]] ; then
......@@ -537,7 +537,6 @@ fi
# Enter device for /boot partition or skip. If one is entered, test it.
echo -n $"
If you created a separate partition for /boot, enter it here.
To skip this, just hit the ENTER key.
......@@ -550,7 +549,7 @@ if ! [[ -z $boot_dev ]] && ! [[ -b $boot_dev ]] ; then
You may continue and install without a separate boot partition,
or you can hit ctrl-c to exit, then re-run the script, and
be sure to create a partition for /boot.
"
"
boot_dev=
echo $"Press ENTER when you're ready to continue"
read -p " "
......@@ -572,14 +571,14 @@ fi
choose_fs_boot () {
while true; do
echo -n $"
What type of filesystem would you like on $boot_dev?
Choices (enter number):
2) ext2 (recommended for /boot)
3) ext3
4) ext4
"
"
read ans
case $ans in
2) fs_type_boot="ext2" ; break ;;
......@@ -639,7 +638,7 @@ choose_fs_os () {
Do you want the operating system on an encrypted partition?
1) yes
2) no
"
"
read ans
case $ans in
[1Yy]*) encrypt_os="yes"
......@@ -653,7 +652,7 @@ choose_fs_os () {
1) Yes, proceed without encrypting the partition
2) No. Exit
"
"
read ans
case $ans in
[1Yy]*) encrypt_os="no" ; break 2 ;;
......@@ -674,7 +673,7 @@ choose_fs_os () {
1) Yes, proceed without encrypting the partition
2) No. Exit
"
"
read ans
case $ans in
[1Yy]*) break ;;
......@@ -714,7 +713,7 @@ if [[ -n $home_dev ]] && ! [[ -b $home_dev ]] ; then
You may continue and install everything to one partition,
or you can hit ctrl-c to exit, then re-run the script, and
be sure to create a partition for /home.
"
"
home_dev=
echo $"Press ENTER when you're ready to continue"
read -p " "
......@@ -731,7 +730,7 @@ choose_fs_home () {
2) ext2
3) ext3
4) ext4
"
"
read ans
case $ans in
2) fs_type_home="ext2" ; break ;;
......@@ -748,7 +747,7 @@ choose_fs_home () {
Do you want /home on an encrypted partition?
1) Yes
2) No
"
"
read ans
case $ans in
[1Yy]*) encrypt_home="yes"
......@@ -762,7 +761,7 @@ choose_fs_home () {
1) Yes, proceed without encrypting the partition.
2) No. Exit
"
"
read ans
case $ans in
[1Yy]*) encrypt_home="no" ; break 2 ;;
......@@ -820,7 +819,7 @@ while true; do
This is useful if your drive order changes between reboots.
Press ENTER for YES.
Press 2 for no.
"
"
read ans
case $ans in
[2Nn]*) break ;;
......@@ -932,7 +931,7 @@ while true; do
WARNING: This is your last chance to exit before any changes are made.
Proceed with the installation?
1) Tes
1) Yes
2) No, abort the installation.
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
......@@ -1044,12 +1043,12 @@ if [[ -n $home_dev ]] ; then
echo $"
Preparing $home_dev...
"
"
mkdir /target_home ; check_exit
if [[ $encrypt_home = yes ]]; then
echo $"
You will need to create a passphrase.
"
"
cryptsetup luksFormat "$home_dev"
check_exit
echo $"Encrypted partition created. Opening it..."
......@@ -1124,7 +1123,7 @@ while true; do
echo -e $" \n\nDisable auto-login?
Press ENTER for YES.
Press 2 for no.
"
"
read ans
case $ans in
[2Nn]*) break ;;
......@@ -1453,6 +1452,14 @@ copy_grub_packages () {
find "$grub_package_dir" -maxdepth 1 -name "$grub_package" -exec cp {} /target \;
# chroot /target find . -name $grub_package -maxdepth 1 -exec dpkg -i {} \; # this works, but grub-pc/grub-pc-bin installed out of order.
chroot /target /bin/bash -c "dpkg -i $grub_package" # This works. They installed in right order.
if [[ "$grub_package" =~ grub-pc ]] ; then
grubversion="grub-pc"
select_grub_dev
fi
if [[ "$grub_package" =~ grub-efi ]] ; then
grubversion="grub-efi"
grub_dev="efi"
fi
install_grub
}
......@@ -1472,8 +1479,8 @@ while true ; do
The installed system is ready for chroot. (proc, sys, dev are mounted)
Make a selection when you are ready to proceed.
$grub_dev_message
Choices (enter number)
${grub_opt}
3) Continue without a bootloader.
......@@ -1600,7 +1607,7 @@ while true; do
2) Permit sudo for new user (and keep root account.)
3) Use sudo as default for new user (and disable root account.)
4) Use sudo only for shutdown (and keep root account.)
"
"
read ans
case $ans in
[1Aa]) break ;;
......@@ -1666,26 +1673,6 @@ if [ "$sudo_shutdown" = "TRUE" ]; then
echo "$newusername ALL= NOPASSWD: /usr/sbin/pm-suspend, /usr/sbin/pm-hibernate, /sbin/halt, /sbin/reboot" > "$sudo_include_file"
fi
if [[ $disable_auto_desktop = "yes" ]]; then
set_noautologin_desktop
disable_auto_console="yes"
else
set_autologin_desktop
fi
# Disable console autologin
if [[ $disable_auto_console = "yes" ]]; then
if grep -q "respawn:/bin/login -f" /target/etc/inittab ; then
mv /target/etc/inittab /target/etc/inittab.$(date +%Y%m%d_%H%M)
cp /usr/lib/refractainstaller/inittab.debian /target/etc/inittab
fi
else
sed -i "/respawn:/s/$oldusername/$newusername/g" /target/etc/inittab
fi
while true; do
echo -n $"
Change root password?
......@@ -1709,6 +1696,25 @@ fi
fi
if [[ $disable_auto_desktop = "yes" ]]; then
set_noautologin_desktop
disable_auto_console="yes"
else
set_autologin_desktop
fi
# Disable console autologin
if [[ $disable_auto_console = "yes" ]]; then
if grep -q "respawn:/bin/login -f" /target/etc/inittab ; then
mv /target/etc/inittab /target/etc/inittab.$(date +%Y%m%d_%H%M)
cp /usr/lib/refractainstaller/inittab.debian /target/etc/inittab
fi
else
sed -i "/respawn:/s/$oldusername/$newusername/g" /target/etc/inittab
fi
if [[ $additional_partitions = "yes" ]] ; then
if ! [[ -h /usr/lib/refractainstaller/post-install/move-dir-mount-gui.sh ]] ; then
ln -s /usr/lib/refractainstaller/move-dir-mount-gui.sh /usr/lib/refractainstaller/post-install/move-dir-mount-gui.sh
......@@ -1739,5 +1745,5 @@ echo $"
Done! You may now reboot into the new system.
If you want to change the user name, then run
change-username after reboot.
"
"
exit 0
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-11-05 08:00-0500\n"
"POT-Creation-Date: 2017-12-30 13:39-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -31,7 +31,7 @@ msgid ""
"\t\t-h, --help\t\tshow this help text\n"
"\t\t-v, --version\tdisplay the version information\n"
"\t\t-d. --debug\t\tdebug mode\n"
"\t\t\n"
"\n"
msgstr ""
#: refractainstaller:76
......@@ -80,12 +80,10 @@ msgstr ""
#: refractainstaller:158
#, sh-format
msgid ""
" Creating rsync excludes file, $rsync_excludes\n"
" "
msgid " Creating rsync excludes file, $rsync_excludes\n"
msgstr ""
#: refractainstaller:218
#: refractainstaller:219
msgid ""
"\n"
"\tNow that you know what you're doing...\n"
......@@ -94,7 +92,7 @@ msgid ""
"\t2) Abort the installation\n"
msgstr ""
#: refractainstaller:240
#: refractainstaller:241
#, sh-format
msgid ""
" EFI partition found at ${esp_dev}\n"
......@@ -102,22 +100,22 @@ msgid ""
" and you should investigate the situation."
msgstr ""
#: refractainstaller:246
#: refractainstaller:247
msgid " There is no EFI partition. You will need to create one."
msgstr ""
#: refractainstaller:248
#: refractainstaller:249
msgid ""
" More than one EFI partition was detected. You will need to select one. "
"Normally, it's on the first hard disk."
msgstr ""
#: refractainstaller:257 refractainstaller:312
#: refractainstaller:258 refractainstaller:313
#, sh-format
msgid "grub package(s) found in $grub_package_dir"
msgstr ""
#: refractainstaller:259
#: refractainstaller:260
#, sh-format
msgid ""
"\t\t\t### WARNING ### \n"
......@@ -130,7 +128,7 @@ msgid ""
"${grub_debs}\n"
msgstr ""
#: refractainstaller:271
#: refractainstaller:272
#, sh-format
msgid ""
"\n"
......@@ -148,10 +146,9 @@ msgid ""
"\t1) Help \n"
"\t2) Continue\n"
"\t3) Abort the installation\n"
"\t\t"
msgstr ""
#: refractainstaller:299
#: refractainstaller:300
#, sh-format
msgid ""
"EFI partition(s) found. Do not format any EFI\n"
......@@ -159,7 +156,7 @@ msgid ""
"${esp_list}\n"
msgstr ""
#: refractainstaller:314
#: refractainstaller:315
#, sh-format
msgid ""
"\t\t\t### WARNING ### \n"
......@@ -172,7 +169,7 @@ msgid ""
"${grub_debs}\n"
msgstr ""
#: refractainstaller:325
#: refractainstaller:326
#, sh-format
msgid ""
"\n"
......@@ -186,10 +183,9 @@ msgid ""
"\n"
"\t1) Continue\n"
"\t2) Abort the installation\n"
"\t\t"
msgstr ""
#: refractainstaller:358
#: refractainstaller:359
#, sh-format
msgid ""
" \n"
......@@ -203,10 +199,9 @@ msgid ""
" 2. $cli_partition_tool\n"
" 3. No thanks, I already have a partition prepared. Continue.\n"
" 4. I'd like to exit the script now.\n"
" "
msgstr ""
#: refractainstaller:374
#: refractainstaller:375
#, sh-format
msgid ""
"\n"
......@@ -217,7 +212,7 @@ msgid ""
"\t2) No (exit the script)\n"
msgstr ""
#: refractainstaller:393
#: refractainstaller:394
#, sh-format
msgid ""
"\n"
......@@ -228,14 +223,14 @@ msgid ""
"2) No (exit the script)\n"
msgstr ""
#: refractainstaller:425
#: refractainstaller:426
msgid ""
"\n"
" Press 1 to see a list of drives and partitions\n"
" or press ENTER to proceed."
msgstr ""
#: refractainstaller:439
#: refractainstaller:440
#, sh-format
msgid ""
"\n"
......@@ -246,14 +241,14 @@ msgid ""
"\t2) No, proceed without a bootloader.\n"
"\t3) Abort the install to investigate the situation.\n"
" \n"
" Format new efi partition? (y/n/x): "
" Format new efi partition?: "
msgstr ""
#: refractainstaller:468
#: refractainstaller:469
msgid "There is no EFI partition. You will need to create one."
msgstr ""
#: refractainstaller:472
#: refractainstaller:473
#, sh-format
msgid ""
"\n"
......@@ -267,7 +262,7 @@ msgid ""
"enter device:"
msgstr ""
#: refractainstaller:483
#: refractainstaller:484
msgid ""
"Not a valid EFI partition.\n"
"\n"
......@@ -275,7 +270,7 @@ msgid ""
"DO NOT SELECT AN EFI PARITION FOR ANOTHER PURPOSE."
msgstr ""
#: refractainstaller:505
#: refractainstaller:506
msgid ""
"\n"
"\t\n"
......@@ -284,18 +279,16 @@ msgid ""
"\t \n"
"\t If you don't want to install the bootloader, leave this blank.\n"
"\t You will need to do some manual configuration after the install.:\n"
"\t "
msgstr ""
#: refractainstaller:516
#: refractainstaller:517
#, sh-format
msgid "$grub_dev is not a block device. "
msgstr ""
#: refractainstaller:538
#: refractainstaller:539
msgid ""
"\n"
"\n"
" If you created a separate partition for /boot, enter it here.\n"
" To skip this, just hit the ENTER key.\n"
" \n"
......@@ -309,7 +302,6 @@ msgid ""
" You may continue and install without a separate boot partition,\n"
" or you can hit ctrl-c to exit, then re-run the script, and\n"
" be sure to create a partition for /boot.\n"
" "
msgstr ""
#: refractainstaller:554 refractainstaller:564 refractainstaller:718
......@@ -327,14 +319,13 @@ msgstr ""
#, sh-format
msgid ""
"\n"
" \n"
"\n"
" What type of filesystem would you like on $boot_dev?\n"
" \n"
" Choices (enter number):\n"
" 2) ext2 (recommended for /boot)\n"
" 3) ext3\n"
" 4) ext4\n"
" "
msgstr ""
#: refractainstaller:602
......@@ -372,7 +363,6 @@ msgid ""
" Do you want the operating system on an encrypted partition?\n"
" 1) yes\n"
" 2) no\n"
"\t "
msgstr ""
#: refractainstaller:648
......@@ -384,7 +374,6 @@ msgid ""
" \n"
" 1) Yes, proceed without encrypting the partition\n"
" 2) No. Exit\n"
" "
msgstr ""
#: refractainstaller:668
......@@ -594,15 +583,15 @@ msgstr ""
msgid "\\n Installing the boot loader...\\n"
msgstr ""
#: refractainstaller:1463
#: refractainstaller:1471
msgid "1) Copy grub packages to /target and install bootloader"
msgstr ""
#: refractainstaller:1465
#: refractainstaller:1473
msgid "2) Install bootloader and finish the installation"
msgstr ""
#: refractainstaller:1469
#: refractainstaller:1477
#, sh-format
msgid ""
" ****************************************************************\n"
......@@ -610,15 +599,15 @@ msgid ""
"\tThe installed system is ready for chroot. (proc, sys, dev are mounted)\n"
"\tMake a selection when you are ready to proceed.\n"
"\t\n"
"\t$grub_dev_message\n"
"\t\n"
"\n"
"\tChoices (enter number)\n"
"\t\t${grub_opt}\n"
"\t\t3) Continue without a bootloader.\n"
"\t\t4) Abort the installation and exit.\n"
msgstr ""
#: refractainstaller:1527
#: refractainstaller:1535
#, sh-format
msgid ""
"\n"
......@@ -627,13 +616,13 @@ msgid ""
" press ENTER.\n"
msgstr ""
#: refractainstaller:1535
#: refractainstaller:1543
msgid ""
"\n"
" Enter the new user's real name.\n"
msgstr ""
#: refractainstaller:1562
#: refractainstaller:1570
msgid ""
"\n"
" Change the new user's password?\n"
......@@ -641,11 +630,11 @@ msgid ""
" Press 2 for no.\n"
msgstr ""
#: refractainstaller:1573
#: refractainstaller:1581
msgid "Change user's passowrd"
msgstr ""
#: refractainstaller:1590
#: refractainstaller:1598
msgid ""
"\n"
" Most live images use 'sudo' for root access. No password is required.\n"
......@@ -662,11 +651,11 @@ msgid ""
" "
msgstr ""
#: refractainstaller:1637
#: refractainstaller:1645
msgid "disabling root account.. "
msgstr ""
#: refractainstaller:1689
#: refractainstaller:1677
msgid ""
"\n"
" Change root password?\n"
......@@ -674,11 +663,11 @@ msgid ""
" Press 2 for no.\n"
msgstr ""
#: refractainstaller:1701
#: refractainstaller:1689
msgid "Change root passowrd"
msgstr ""
#: refractainstaller:1737
#: refractainstaller:1744
msgid ""
"\n"
" Done! You may now reboot into the new system.\n"
......
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