daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 824d58df34446d941693f78ac9b58204e45d0530..7d8d187b1181f9929919a06661c776bf5e9c3a7a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -606,6 +606,7 @@ maybe chmod 0644 'dpkg/origins/debian'
 maybe chmod 0644 'dpkg/origins/ubuntu'
 maybe chmod 0755 'dropbear'
 maybe chmod 0755 'dropbear-initramfs'
+maybe chmod 0644 'dropbear-initramfs/authorized_keys'
 maybe chmod 0644 'dropbear-initramfs/config'
 maybe chmod 0600 'dropbear-initramfs/dropbear_dss_host_key'
 maybe chmod 0600 'dropbear-initramfs/dropbear_ecdsa_host_key'

diff --git a/default/grub b/default/grub
index 54e73c94d5a6e64cf9cc53eb9a9c4c563251ee1e..7a0c9c7f0071c3f773c31ee05bc4405e50332d3c 100644 (file)
--- a/default/grub
+++ b/default/grub
@@ -4,8 +4,8 @@
 #   info -f grub -n 'Simple configuration'
 
 GRUB_DEFAULT=0
-GRUB_TIMEOUT_STYLE=hidden
-GRUB_TIMEOUT=0
+GRUB_TIMEOUT_STYLE=menu
+GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
 GRUB_CMDLINE_LINUX_DEFAULT="nomodeset"
 GRUB_CMDLINE_LINUX=""

diff --git a/dropbear-initramfs/authorized_keys b/dropbear-initramfs/authorized_keys
new file mode 100644 (file)
index 0000000..16ab597
--- /dev/null
+++ b/dropbear-initramfs/authorized_keys
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+HxsTNsbRF+tO0akQlPs+kgmu+t9JF3WaNppB7Y2ydOc8HHVZ6x2qkEZjFDPNKGC4cyxN7ky39xOVMGVTfAUal3yxBnv6Zrmhv+XAcfgcat0vLb7EZqZRgZ5YCp0gkV2SC5sD7uEwOaSxfbbozSgjOVlr0fEsVtyJlXhNpcloIDUhnymv0kf0jdF2z2Ee5WGhK4kGca4lZCHfTurdg0gzTahpisCoJG7IIPg4o1S1QE72e/wbARWVdPulQ5SSGgxB8MZfF9w0TFrY/Et/5cviBg+QWpGQfPFOIZ/ARhq3ge9Sy9TbS1eQYt2daVAE6kyXcb2ckYrWxu63ciPwJuHP root@homeserver

diff --git a/dropbear-initramfs/config b/dropbear-initramfs/config
index 8dcf5c02f5ff111726ca1025a8c88963b3781e77..d39844a60cf71809b2a183750f5d293d6f2f9a7c 100644 (file)
--- a/dropbear-initramfs/config
+++ b/dropbear-initramfs/config
@@ -6,7 +6,7 @@
 #
 # Command line options to pass to dropbear(8)
 #
-#DROPBEAR_OPTIONS=
+DROPBEAR_OPTIONS="-I 180 -j -k -p 2222 -s"
 
 #
 # On local (non-NFS) mounts, interfaces matching this pattern are

diff --git a/initramfs-tools/initramfs.conf b/initramfs-tools/initramfs.conf
index 70ec61401832b8f8fbb65b0c3e0407d2a642786d..9d55d570b97187850cdf19cf4113aadc1845d19a 100644 (file)
--- a/initramfs-tools/initramfs.conf
+++ b/initramfs-tools/initramfs.conf
@@ -27,7 +27,7 @@ MODULES=most
 # be used otherwise.
 #
 
-BUSYBOX=auto
+BUSYBOX=y
 
 #
 # COMPCACHE_SIZE: [ "x K" | "x M" | "x G" | "x %" ]