From 148dbf7db2d83f0e8938925ca496a69b50b2573f Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Thu, 10 Nov 2016 15:04:52 +0100 Subject: [PATCH] =?utf8?q?Modifications=C2=A0:=20=20=20=20=20=20=20=20=20l?= =?utf8?q?ocal/boot-configure=20-=20Passage=20=C3=A0=20tillac?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- etc/crypttab.m4 | 8 ++++---- etc/gitolite | 2 +- etc/inittab | 3 ++- local/boot-configure | 4 +++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/etc/crypttab.m4 b/etc/crypttab.m4 index 984b716..1a3543b 100644 --- a/etc/crypttab.m4 +++ b/etc/crypttab.m4 @@ -1,5 +1,5 @@ # -LOCAL_LLOCAL_LV`'_root_deciphered /dev/LOCAL_LLOCAL_VG/LOCAL_LLOCAL_LV`'_root none luks,lvm=LOCAL_LLOCAL_VG -LOCAL_LLOCAL_LV`'_var_deciphered /dev/LOCAL_LLOCAL_VG/LOCAL_LLOCAL_LV`'_var LOCAL_LLOCAL_LV`'_root_deciphered luks,lvm=LOCAL_LLOCAL_VG,keyscript=/lib/cryptsetup/scripts/decrypt_derived -LOCAL_LLOCAL_LV`'_home_deciphered /dev/LOCAL_LLOCAL_VG/LOCAL_LLOCAL_LV`'_home LOCAL_LLOCAL_LV`'_root_deciphered luks,lvm=LOCAL_LLOCAL_VG,keyscript=/lib/cryptsetup/scripts/decrypt_derived -LOCAL_LLOCAL_LV`'_swap_deciphered /dev/LOCAL_LLOCAL_VG/LOCAL_LLOCAL_LV`'_swap LOCAL_LLOCAL_LV`'_root_deciphered luks,lvm=LOCAL_LLOCAL_VG,keyscript=/lib/cryptsetup/scripts/decrypt_derived +ateliers_root_deciphered /dev/ateliers.heureux-cyclage.org/ateliers_root none luks,lvm=ateliers.heureux-cyclage.org +ateliers_var_deciphered /dev/ateliers.heureux-cyclage.org/ateliers_var /.root.key luks,lvm=ateliers.heureux-cyclage.org +ateliers_home_deciphered /dev/ateliers.heureux-cyclage.org/ateliers_home /.root.key luks,lvm=ateliers.heureux-cyclage.org +ateliers_swap_deciphered /dev/ateliers.heureux-cyclage.org/ateliers_swap /.root.key luks,lvm=ateliers.heureux-cyclage.org diff --git a/etc/gitolite b/etc/gitolite index 118d6a4..e62661f 160000 --- a/etc/gitolite +++ b/etc/gitolite @@ -1 +1 @@ -Subproject commit 118d6a4c5fa48e5150c868cf1f4c790dfdab6d53 +Subproject commit e62661fa0bd9148cffb59371f66769d6a550a6f8 diff --git a/etc/inittab b/etc/inittab index b0b7641..a17a694 100644 --- a/etc/inittab +++ b/etc/inittab @@ -38,7 +38,8 @@ po::powerokwait:/etc/init.d/powerfail stop # Xen hypervisor console hvc:2345:respawn:/sbin/getty 38400 hvc0 -#xvc:2345:respawn:/sbin/getty 38400 xvc0 +# Ganeti console +S0:12345:respawn:/sbin/agetty --keep-baud 115200,38400,9600 ttyS0 vt100 #-- runit begin SV:123456:respawn:/usr/sbin/runsvdir-start diff --git a/local/boot-configure b/local/boot-configure index d620787..1a7c1fe 100755 --- a/local/boot-configure +++ b/local/boot-configure @@ -14,9 +14,11 @@ sudo install -m 644 -o root -g root /dev/stdin \ GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR=\`lsb_release -i -s 2> /dev/null || echo Debian\` GRUB_CMDLINE_LINUX_DEFAULT="quiet" - GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 ip=$local_ipv4::$local_gateway:$local_netmask:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered" + GRUB_CMDLINE_LINUX="vt.default_utf8=1 rootfstype=ext4 loglevel=5 console=hvc0 console=ttyS0 ip=$local_ipv4::$local_gateway:$local_netmask:$vm:eth0:off resume=/dev/mapper/${vm}_swap_deciphered" GRUB_DISABLE_RECOVERY="true" #GRUB_PRELOAD_MODULES="lvm" + GRUB_TERMINAL="console serial" + GRUB_SERIAL_COMMAND="serial --unit=0 --speed=38400 --word=8 --parity=no --stop=1" EOF sudo install -m 644 -o root -g root /dev/stdin \ /boot/grub/device.map <<-EOF -- 2.20.1