saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index dc68803dacc9a0c8bcb9cf27fb50ba178d20c57c..5a029873ec8028af3856b5345a6f519610ae3483 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1908,7 +1908,6 @@ maybe chmod 0644 'modprobe.d/aliases.conf'
 maybe chmod 0644 'modprobe.d/i386.conf'
 maybe chmod 0644 'motd.1'
 maybe chmod 0644 'motd.tail'
-maybe chmod 0644 'mtab'
 maybe chmod 0755 'mutt'
 maybe chmod 0644 'mutt/Muttrc'
 maybe chmod 0644 'mutt/Muttrc.dist'

diff --git a/mtab b/mtab
deleted file mode 100644 (file)
index 0a52f8c307ec502a6ec121c49561b0160d5cce07..0000000000000000000000000000000000000000
--- a/mtab
+++ /dev/null
@@ -1,32 +0,0 @@
-proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0
-udev /dev devtmpfs rw,nosuid,relatime,size=10240k,nr_inodes=493054,mode=755 0 0
-devpts /dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0
-sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0
-/dev/md2 / ext3 rw,noatime,errors=continue,user_xattr,acl,barrier=1,data=writeback 0 0
-tmpfs /run tmpfs rw,nodev,relatime,size=401744k,mode=755 0 0
-mqueue /dev/mqueue mqueue rw,nosuid,nodev,noexec,relatime 0 0
-shm /dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
-securityfs /sys/kernel/security securityfs rw,nosuid,nodev,noexec,relatime 0 0
-debugfs /sys/kernel/debug debugfs rw,nosuid,nodev,noexec,relatime 0 0
-cgroup_root /sys/fs/cgroup tmpfs rw,nosuid,nodev,noexec,relatime,size=10240k,mode=755 0 0
-selinuxfs /sys/fs/selinux selinuxfs rw,relatime 0 0
-openrc /sys/fs/cgroup/openrc cgroup rw,nosuid,nodev,noexec,relatime,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc 0 0
-cpuset /sys/fs/cgroup/cpuset cgroup rw,nosuid,nodev,noexec,relatime,cpuset 0 0
-cpu /sys/fs/cgroup/cpu cgroup rw,nosuid,nodev,noexec,relatime,cpu 0 0
-cpuacct /sys/fs/cgroup/cpuacct cgroup rw,nosuid,nodev,noexec,relatime,cpuacct 0 0
-blkio /sys/fs/cgroup/blkio cgroup rw,nosuid,nodev,noexec,relatime,blkio 0 0
-memory /sys/fs/cgroup/memory cgroup rw,nosuid,nodev,noexec,relatime,memory 0 0
-freezer /sys/fs/cgroup/freezer cgroup rw,nosuid,nodev,noexec,relatime,freezer 0 0
-net_cls /sys/fs/cgroup/net_cls cgroup rw,nosuid,nodev,noexec,relatime,net_cls 0 0
-net_prio /sys/fs/cgroup/net_prio cgroup rw,nosuid,nodev,noexec,relatime,net_prio 0 0
-hugetlb /sys/fs/cgroup/hugetlb cgroup rw,nosuid,nodev,noexec,relatime,hugetlb 0 0
-/dev/mapper/vg0-tmp /tmp ext4 rw,noatime 0 0
-/dev/mapper/vg0-home /home ext4 rw,acl,user_xattr 0 0
-/dev/mapper/vg0-var_tmp /var/tmp ext4 rw,noatime 0 0
-/dev/mapper/vg0-www /var/www ext4 rw,acl,user_xattr 0 0
-/dev/mapper/vg0-var_lib /var/lib ext4 rw,noatime,acl,user_xattr 0 0
-/dev/mapper/vg0-backup /var/backup ext4 rw,noatime,acl,user_xattr 0 0
-/dev/mapper/vg0-portage /usr/portage ext4 rw,noatime 0 0
-/dev/mapper/vg0-distfiles /usr/portage/distfiles ext4 rw,noatime 0 0
-/dev/md1 /ubuntu ext3 ro,noatime,acl,user_xattr 0 0
-binfmt_misc /proc/sys/fs/binfmt_misc binfmt_misc rw,nodev,noexec,nosuid 0 0

diff --git a/mtab b/mtab
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..27e43ccc8a8a1264d85bd5fa17ebd78df9cc6622
--- /dev/null
+++ b/mtab
@@ -0,0 +1 @@
+/proc/self/mounts
\ No newline at end of file

diff --git a/resolv.conf b/resolv.conf
index 47eabe45883a349959d01c7f7f4b494bf1266c99..ddabc2198f4c0eaab867522c5fa9c399e84ac1e4 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,6 +1,6 @@
 # Generated by net-scripts for interface eth0
 domain brehm-online.com
-search brehm-online.com serverkompetenz.net uhu-banane.de
+search brehm-online.com brehm-online.eu brehm-berlin.de serverkompetenz.net
 nameserver 127.0.0.1
 nameserver 81.169.163.106
 nameserver 85.214.7.22