saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 7d8d187b1181f9929919a06661c776bf5e9c3a7a..2da631247447c14eb447348583923f4468ae9021 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -359,7 +359,6 @@ maybe chmod 0644 'apparmor.d/tunables/alias'
 maybe chmod 0644 'apparmor.d/tunables/apparmorfs'
 maybe chmod 0644 'apparmor.d/tunables/dovecot'
 maybe chmod 0644 'apparmor.d/tunables/global'
-maybe chmod 0644 'apparmor.d/tunables/home'
 maybe chmod 0755 'apparmor.d/tunables/home.d'
 maybe chmod 0644 'apparmor.d/tunables/home.d/site.local'
 maybe chmod 0644 'apparmor.d/tunables/home.d/ubuntu'

diff --git a/apparmor.d/tunables/home b/apparmor.d/tunables/home
deleted file mode 100644 (file)
index 550ccd5..0000000
--- a/apparmor.d/tunables/home
+++ /dev/null
@@ -1,25 +0,0 @@
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2006-2009 Novell/SUSE
-#    Copyright (C) 2010 Canonical Ltd.
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-
-# @{HOME} is a space-separated list of all user home directories. While
-# it doesn't refer to a specific home directory (AppArmor doesn't
-# enforce discretionary access controls) it can be used as if it did
-# refer to a specific home directory
-@{HOME}=@{HOMEDIRS}/*/ /root/
-
-# @{HOMEDIRS} is a space-separated list of where user home directories
-# are stored, for programs that must enumerate all home directories on a
-# system.
-@{HOMEDIRS}=/home/
-
-# Also, include files in tunables/home.d for site-specific adjustments to
-# @{HOMEDIRS}.
-#include <tunables/home.d>

diff --git a/crypttab b/crypttab
index 83205143980f159d81de025bfca916a332089a25..adae540a5b6f60f1634362b01ad169daeb39b347 100644 (file)
--- a/crypttab
+++ b/crypttab
@@ -1 +1,2 @@
 # <target name>        <source device>         <key file>      <options>
+sda2_crypt UUID=225f66af-8020-49c8-85fd-b356dfcff716 none luks,discard

diff --git a/fstab b/fstab
index b99692bfd319a7eed60d6a0a36dd86272cab8d34..515289896279888831d5533870bbb59ec95260e0 100644 (file)
--- a/fstab
+++ b/fstab
@@ -6,7 +6,9 @@
 #
 # <file system> <mount point>   <type>  <options>       <dump>  <pass>
 # / was on /dev/sda2 during installation
-UUID=354d6752-65bd-4e4d-acf0-42e4c6897e73 /               ext4    errors=remount-ro 0       0
+UUID=58420c04-2d69-4acf-8941-c2451b8dc71e /               ext4    errors=remount-ro 0       0
 # /boot was on /dev/sda1 during installation
 UUID=81642b62-d094-4945-922e-000c7c6de7a5 /boot           ext4    defaults,noatime        0       0
-/swapfile                                 none            swap    sw              0       0
+UUID=26bbbac4-21c2-432c-805c-e29bae844137 /var            ext4    errors=remount-ro 0       0
+UUID=8c4124a8-cf1b-42e4-bc5f-75d82d1f9b57 /home           ext4    errors=remount-ro 0       0
+UUID=5f576043-e24a-44d3-869d-330d56f0bd46 none            swap    sw              0       0

diff --git a/initramfs-tools/initramfs.conf b/initramfs-tools/initramfs.conf
index 9d55d570b97187850cdf19cf4113aadc1845d19a..f354d08bef4ba41e8ebce47ac479ed76f2326891 100644 (file)
--- a/initramfs-tools/initramfs.conf
+++ b/initramfs-tools/initramfs.conf
@@ -65,6 +65,8 @@ COMPRESS=lz4
 
 DEVICE=
 
+IP=:::::ens18:dhcp
+
 #
 # NFSROOT: [ auto | HOST:MOUNT ]
 #