Commit Graph

979 Commits

Author SHA1 Message Date
Dylan Whyte
c455665230 installer: minor language fixup
just some nitpicky changes.

v2:
- remove tag files
@Thomas: Like you thought, they are autogenerated by some vim plugin.
They usually sit quitely in the untracked files, but this time, I guess
I somehow I managed to add them in without noticing.. Apologies!

Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
2020-12-15 14:44:14 +01:00
Thomas Lamprecht
002b27d2b7 track pbs-banner
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 20:07:09 +01:00
Stoiko Ivanov
2663e17182 set the keymap on the installer console
this patch partially reverts 8bc528041b
by writing /etc/default/keyboard and running `setupcon` in the background
the delay should not harm the UX in the installer

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:04:52 +01:00
Stoiko Ivanov
0e63147908 add run_in_background
certain tasks done during the installer need not block the GUI (e.g. setting
the keymap of the console, to have the correct one set in the shell on vt3)
and take a longer time.

This patch adds a simple run_in_background method, which forks and runs the
provided code in the child. Before exiting the children get reaped.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:04:52 +01:00
Stoiko Ivanov
d92ada4e1d memorize keyboard layout selection
currently when using the previous/next buttons the keyboard layout gets
defined based on the detected/selected country, even if it was set to a
different value explicitly.

This patch changes the behaviour to only update the layout and set it in
the installer if it got actively changed, or if a different country was
selected

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-12-10 20:04:52 +01:00
Thomas Lamprecht
2cdba397f0 code cleanup
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 19:21:57 +01:00
Thomas Lamprecht
0bc39c50f0 fixup! fix #2518: disk selector: add "deselect all" button 2020-12-10 19:21:29 +01:00
Thomas Lamprecht
8f38d1a1d5 disk selector: shorten ZFS/HW-RAID note
makes it fit on one line

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 19:01:29 +01:00
Thomas Lamprecht
6d8b856492 disk selector: set min height for scroll window, adapt margins
add more inner margin for scroll bar and reduce outer margins to
avoid to much empty border space.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 19:00:57 +01:00
Thomas Lamprecht
3235f39bf7 fix #2518: disk selector: add "deselect all" button
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 18:53:36 +01:00
Thomas Lamprecht
04fa0758d3 factor out hd count variable
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-12-10 17:48:08 +01:00
Thomas Lamprecht
e93199d2d1 bump version to 6.3-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-10 15:03:21 +01:00
Thomas Lamprecht
b11c55ff0e tree wide s/e-mail/email/ fixup
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-10 15:02:11 +01:00
Oguz Bektas
8bc528041b don't configure vt keyboard during installation
in create_country_view() when setting the keyboard config
setupcon is too slow, causing installer to hang for some
seconds when switching to/from country view.

setxkbmap is enough during the installation (next step
password & email works fine with different keymaps), vt
is largely unused during it anyway.

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
2020-11-09 19:57:24 +01:00
Dylan Whyte
9d89231aa6 PBS installer: Language fixup
- Correct spelling and grammar
- Minor rewordings for readability

Signed-off-by: Dylan Whyte <d.whyte@proxmox.com>
2020-11-09 13:34:19 +01:00
Thomas Lamprecht
7dc66ff788 bump version to 6.3-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 19:35:52 +01:00
Thomas Lamprecht
dfc02f3c70 fix #3093: allow to automatically reboot on installation success
Only auto reboot if no error happened.

default to on, as this is normally wanted behavior - the success
screem does not allow to do anything else anyway, and the IP address
gets then also showed as issue banner after that reboot.

show some countdown (it's set to 5 seconds, but due some internal
delay it more like 3s)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 19:29:47 +01:00
Thomas Lamprecht
1fdb7014dd html: unify fail template
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 19:06:37 +01:00
Thomas Lamprecht
cfb923645a html: unify success template
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 19:06:37 +01:00
Thomas Lamprecht
cc120d790d proxinstall: replace dot notation netmask with CIDR notation as primary input
Use two fields it a single row: [ <address> ] / [ <mask> ]

Make the others also a bit bigger for symmetry.

Adapt html templates respectively.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 18:44:10 +01:00
Thomas Lamprecht
b10074d176 proxinstall: add more info to product config
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 18:44:10 +01:00
Thomas Lamprecht
7fcebc9acd html common: cleanup IP config template
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 18:44:10 +01:00
Thomas Lamprecht
bc3b48b61d html common: cleanup ack summary template
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 18:44:10 +01:00
Thomas Lamprecht
e32b8d2dc8 pbs: write out email to user.cfg
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 18:44:05 +01:00
Thomas Lamprecht
341a93b795 split out chroot-ed chmod and chown
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-08 16:59:38 +01:00
Thomas Lamprecht
eaeccd9f99 perlcritic fixes
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-11-07 10:56:27 +01:00
Oguz Bektas
0abf0d3683 fix #3057: remove ext3 option from installer
we can safely remove this from the fs options

nobody uses this anymore, and it just ends up causing problems like in
[0]

[0]: https://forum.proxmox.com/threads/emlink-too-many-links.73108/

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
2020-10-22 18:59:24 +02:00
Stoiko Ivanov
07ec6825f4 set console keymap on language selection
This is an enhancement for #2804

Having a shell waiting on vt3, it improves user experience if it has the
same keyboard map as the X11 installer.

This is accomplished by setting the contents of '/etc/default/keyboard' and
then running `setupcon`. Simply calling `loadkeys` would not work, since the
keymaps in debian are generated from the x11 definitions by ckbcomp and then
saved in '/etc/console-setup/'.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-08-13 12:45:41 +02:00
Stoiko Ivanov
d8530b7441 fix 2925: edit /etc/kernel/cmdline unconditionally
currently the installer prepares the ESP disks for ZFS, irrespective of the
boot-mode (EFI, legacy) - in order to enable users to change the boot-mode
in the BIOS and keep the system bootable.

This patch updates /etc/kernel/cmdline in both boot-modes, which is necessary
to make the system actually bootable (else the systemd-boot config uses
the cmdline from the installer).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-08-13 12:43:30 +02:00
Thomas Lamprecht
86ebed3b45 bump version to 6.2-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-07-07 15:37:09 +02:00
Thomas Lamprecht
827825e2a6 pbs: update installation html texts
Originally-by: Daniela Häsler <daniela@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-07-07 15:35:32 +02:00
Thomas Lamprecht
e0837b92e9 partially revert "pbs: create default DS"
we now can create a datastore on new disk(s) over api/ui so a
default datastore on the root mountpoint makes no sense anymore.
partially reverts commit ca74501dce

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-07-03 16:58:00 +02:00
Stoiko Ivanov
909936b54c fix #2804: add a root shell on tty3
Tested locally in a VM:
The setsid was necessary to give the bash job-control (otherwise Ctrl+C would
simply kill the shell).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-06-24 10:52:26 +02:00
Thomas Lamprecht
ba0efb128e bump version to 6.2-2
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-05-25 22:36:35 +02:00
Thomas Lamprecht
ca74501dce pbs: create default DS
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-05-25 22:36:35 +02:00
Thomas Lamprecht
b1838e1ecd write out interfaces address in CIDR notation
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-05-25 21:11:39 +02:00
Thomas Lamprecht
c960597435 bump version to 6.1-5
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-05-10 21:21:18 +02:00
Thomas Lamprecht
2e3fe72217 unconfigured: don't trap "bad" debug-shell exits
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-05-08 11:21:48 +02:00
Thomas Lamprecht
528e976172 bump version to 6.1-4
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 19:40:34 +02:00
Thomas Lamprecht
fb7bdbd479 followup: fix file mode
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 19:10:25 +02:00
Thomas Lamprecht
09cc3546b9 improve spice integration
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 15:19:09 +02:00
Thomas Lamprecht
d6b47e68bd start installer in full screen mode
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 15:18:35 +02:00
Thomas Lamprecht
aa0fe276f1 unconfigured: make agetty listen on tty9
it's a bit brittle and login is weird (enter root user twice, pw
doesn't matters) and once exited it's gone, but it's just for
"emergency debugging" anyway

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 15:17:28 +02:00
Thomas Lamprecht
4569e022b6 unconfigured: allow pseudo terminals
allow to open a terminal in X

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-04-24 14:01:32 +02:00
Thomas Lamprecht
b271366182 bump version to 6.1-3
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-03-06 10:57:57 +01:00
Aaron Lauterer
f0830a59cf fix behavior if zfs disks have no by-id path
in some situations it is possible, that a disk does not have a
/dev/disk/by-id path. Reported cases are KVM with virtio-blk [0] and
with VMware player / workstation when using the paravirtual SCSI disk
types [1]. It can be reproduced in Proxmox VE by using virtio-blk disks
for the VM.

> The issue at hand happens because udev does not create the
> /dev/disk/by-id symlink in
> '/lib/udev/rules.d/60-persistent-storage.rules', since it does
> not have a serial-number for the device (which in the virtio-blk case
> is in turn maybe caused by qemu-server not adding one to the
> commandline).
Quoted from [2]

This regression was introduced with commit
e1b490865f which always replaced the disks
in the $vdev variable even if the result of the by-id lookup was
`undef`. Thus the paths did not point to any valid disk and the zpool
creation failed.

This patch replaces the disk paths with by-id paths only if they are
present.

[0] https://forum.proxmox.com/threads/installation-on-raidz-1-fails.65603/
[1] https://forum.proxmox.com/threads/not-install-promox-6-1-zfs-0-04-disk-vmware-15-pro.65269/
[2] https://pve.proxmox.com/pipermail/pve-devel/2020-February/041841.html

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
2020-03-04 15:26:43 +01:00
Stoiko Ivanov
c1cfbb1c89 Revert "drop unused policy-disable-rc.d"
This reverts commit 8ee12a1c34.

`policy-rc.d` invocation is still used by deb-systemd-invoke (1p), despite
it's by now unfitting name.

The policy-rc.d script the installer placed into the chroot prevents the
starting of services by (debianized) maintainer-scripts [0].
This should reduce installation time on one hand, and on the other hand does
mask errors in maintainer-scripts, which error out if no systemd is running
(e.g. inside the chroot)

Noticed the problem, when testing an unrelated patch and running into
an aborted installtion, due to a, already fixed, glitch (missing '||true')
in pve-lxc's postinst script.

[0] https://people.debian.org/~hmh/invokerc.d-policyrc.d-specification.txt
   (did not find anything more current, contradicting the information there)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
2020-02-19 16:53:46 +01:00
Thomas Lamprecht
43764b7b53 html: tree wide trailing whitespace cleanup
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-02-06 12:37:44 +01:00
Thomas Lamprecht
bdb80ef4b3 avoid doing package specific cleanups installer
Packages which we have under control have to ensure themself that the
correct permissions are set, else the "install on top of Debian" also
fails. It just crowd proxinstall unecessarily, so avoid to add new
ones if possible. This specific one is handled in the respective
package since quite a bit.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-02-06 12:35:10 +01:00
Thomas Lamprecht
b680880c12 fix product names according to branding guideline
IOW, do not drop the whitespace between words..

[0]: https://www.proxmox.com/images/proxmox/Proxmox-Corporate-Brandguideline-2018.pdf

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2020-02-06 12:32:46 +01:00