saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 5a73fa6d2871011d06a45cc9f75d18e98b2e78dc..e6b9c26ec236de432af969c3fd1a26ec37899cfa 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -208,6 +208,7 @@ maybe chmod 0644 'console-setup/compose.VISCII.inc'
 maybe chmod 0644 'console-setup/remap.inc'
 maybe chmod 0755 'cron.d'
 maybe chmod 0644 'cron.d/.placeholder'
+maybe chmod 0644 'cron.d/greetings'
 maybe chmod 0644 'cron.d/mdadm'
 maybe chmod 0755 'cron.daily'
 maybe chmod 0644 'cron.daily/.placeholder'
@@ -493,6 +494,7 @@ maybe chmod 0644 'modprobe.d/mdadm.conf'
 maybe chmod 0644 'modules'
 maybe chmod 0755 'modules-load.d'
 maybe chmod 0644 'motd'
+maybe chmod 0644 'motd.orig'
 maybe chmod 0644 'motd.tail'
 maybe chmod 0644 'nanorc'
 maybe chmod 0755 'network'
@@ -606,6 +608,7 @@ maybe chmod 0644 'shells'
 maybe chmod 0755 'skel'
 maybe chmod 0644 'skel/.bash_logout'
 maybe chmod 0644 'skel/.bashrc'
+maybe chmod 0644 'skel/.bashrc.orig'
 maybe chmod 0644 'skel/.cloud-locale-test.skip'
 maybe chmod 0644 'skel/.profile'
 maybe chmod 0755 'ssh'
@@ -626,7 +629,9 @@ maybe chmod 0644 'ssl/certs/ca-certificates.crt'
 maybe chmod 0644 'ssl/openssl.cnf'
 maybe chmod 0700 'ssl/private'
 maybe chmod 0644 'subgid'
+maybe chmod 0644 'subgid-'
 maybe chmod 0644 'subuid'
+maybe chmod 0644 'subuid-'
 maybe chmod 0440 'sudoers'
 maybe chmod 0750 'sudoers.d'
 maybe chmod 0440 'sudoers.d/90-cloud-init-users'

diff --git a/alternatives/editor b/alternatives/editor
index 7a06612bbb735f6844e02ecae16115e11e394441..1d112dac81210d7a950b7fae25d2a1f4372e86f5 120000 (symlink)
--- a/alternatives/editor
+++ b/alternatives/editor
@@ -1 +1 @@
-/bin/nano
\ No newline at end of file
+/usr/bin/vim.basic
\ No newline at end of file

diff --git a/alternatives/editor.1.gz b/alternatives/editor.1.gz
index bb2d082cddedb565311bf288210c3bcb68d5ee0a..e02a6af1693ae4e6c7f34499002ee72d0e73a7a5 120000 (symlink)
--- a/alternatives/editor.1.gz
+++ b/alternatives/editor.1.gz
@@ -1 +1 @@
-/usr/share/man/man1/nano.1.gz
\ No newline at end of file
+/usr/share/man/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.da.1.gz b/alternatives/editor.da.1.gz
new file mode 120000 (symlink)
index 0000000..c90068f
--- /dev/null
+++ b/alternatives/editor.da.1.gz
@@ -0,0 +1 @@
+/usr/share/man/da/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.de.1.gz b/alternatives/editor.de.1.gz
new file mode 120000 (symlink)
index 0000000..d89833a
--- /dev/null
+++ b/alternatives/editor.de.1.gz
@@ -0,0 +1 @@
+/usr/share/man/de/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.fr.1.gz b/alternatives/editor.fr.1.gz
new file mode 120000 (symlink)
index 0000000..af52858
--- /dev/null
+++ b/alternatives/editor.fr.1.gz
@@ -0,0 +1 @@
+/usr/share/man/fr/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.it.1.gz b/alternatives/editor.it.1.gz
new file mode 120000 (symlink)
index 0000000..4498a3d
--- /dev/null
+++ b/alternatives/editor.it.1.gz
@@ -0,0 +1 @@
+/usr/share/man/it/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.ja.1.gz b/alternatives/editor.ja.1.gz
new file mode 120000 (symlink)
index 0000000..071acfb
--- /dev/null
+++ b/alternatives/editor.ja.1.gz
@@ -0,0 +1 @@
+/usr/share/man/ja/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.pl.1.gz b/alternatives/editor.pl.1.gz
new file mode 120000 (symlink)
index 0000000..345590a
--- /dev/null
+++ b/alternatives/editor.pl.1.gz
@@ -0,0 +1 @@
+/usr/share/man/pl/man1/vim.1.gz
\ No newline at end of file

diff --git a/alternatives/editor.ru.1.gz b/alternatives/editor.ru.1.gz
new file mode 120000 (symlink)
index 0000000..ea9aa16
--- /dev/null
+++ b/alternatives/editor.ru.1.gz
@@ -0,0 +1 @@
+/usr/share/man/ru/man1/vim.1.gz
\ No newline at end of file

diff --git a/apt/sources.list.d/salt.list b/apt/sources.list.d/salt.list
index d299a18577559fc7899140b89be673407df3d90a..2623898de9b58fec459372344e14ef4eb8d5efa4 100644 (file)
--- a/apt/sources.list.d/salt.list
+++ b/apt/sources.list.d/salt.list
@@ -1 +1,2 @@
 #deb   http://repo.saltstack.com/apt/debian/9/amd64/latest     stretch main
+deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg] https://repo.saltproject.io/py3/debian/10/amd64/latest buster main

diff --git a/cron.d/greetings b/cron.d/greetings
new file mode 100644 (file)
index 0000000..a3bf1b4
--- /dev/null
+++ b/cron.d/greetings
@@ -0,0 +1,3 @@
+# Eine nette Begrüßung ...
+1,11,21,31,41,51  *   *  *  *   root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null
+@reboot                         root test -x /root/bin/generate-motd.sh && /root/bin/generate-motd.sh >/dev/null

diff --git a/group b/group
index 2c895137fc5da3e9fcfd4af892b25bf114b4614f..6b7ad5a887f46c7b11ae620b4612fc0f71dcbfad 100644 (file)
--- a/group
+++ b/group
@@ -1,15 +1,15 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
+root:x:0:frank
+daemon:x:1:frank
+bin:x:2:frank
+sys:x:3:frank
 adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
+tty:x:5:frank
+disk:x:6:frank
+lp:x:7:frank
+mail:x:8:frank
 news:x:9:
 uucp:x:10:
-man:x:12:
+man:x:12:frank
 proxy:x:13:
 kmem:x:15:
 dialout:x:20:
@@ -18,23 +18,23 @@ voice:x:22:
 cdrom:x:24:
 floppy:x:25:
 tape:x:26:
-sudo:x:27:
-audio:x:29:
+sudo:x:27:frank
+audio:x:29:frank
 dip:x:30:
 www-data:x:33:
 backup:x:34:
-operator:x:37:
+operator:x:37:frank
 list:x:38:
 irc:x:39:
 src:x:40:
 gnats:x:41:
 shadow:x:42:
-utmp:x:43:
-video:x:44:
+utmp:x:43:frank
+video:x:44:frank
 sasl:x:45:
 plugdev:x:46:
-staff:x:50:
-games:x:60:
+staff:x:50:frank
+games:x:60:frank
 users:x:100:
 nogroup:x:65534:
 systemd-journal:x:101:
@@ -44,11 +44,11 @@ systemd-resolve:x:104:
 input:x:105:
 kvm:x:106:
 render:x:107:
-crontab:x:108:
+crontab:x:108:frank
 netdev:x:109:
 messagebus:x:110:
 ssh:x:111:
 systemd-coredump:x:999:
 bind:x:112:
-mlocate:x:113:
+mlocate:x:113:frank
 _chrony:x:114:

diff --git a/group- b/group-
index b0476728858d75e004658ddd261d5a9ffae8d2be..2c895137fc5da3e9fcfd4af892b25bf114b4614f 100644 (file)
--- a/group-
+++ b/group-
@@ -51,3 +51,4 @@ ssh:x:111:
 systemd-coredump:x:999:
 bind:x:112:
 mlocate:x:113:
+_chrony:x:114:

diff --git a/gshadow b/gshadow
index 6394cc6c2f952d7ff4ef217d45652c9090c243de..208dd1c75f11b098be0cfaf9ab576f3001a5338d 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -1,15 +1,15 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
+root:*::frank
+daemon:*::frank
+bin:*::frank
+sys:*::frank
 adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
+tty:*::frank
+disk:*::frank
+lp:*::frank
+mail:*::frank
 news:*::
 uucp:*::
-man:*::
+man:*::frank
 proxy:*::
 kmem:*::
 dialout:*::
@@ -18,23 +18,23 @@ voice:*::
 cdrom:*::
 floppy:*::
 tape:*::
-sudo:*::
-audio:*::
+sudo:*::frank
+audio:*::frank
 dip:*::
 www-data:*::
 backup:*::
-operator:*::
+operator:*::frank
 list:*::
 irc:*::
 src:*::
 gnats:*::
 shadow:*::
-utmp:*::
-video:*::
+utmp:*::frank
+video:*::frank
 sasl:*::
 plugdev:*::
-staff:*::
-games:*::
+staff:*::frank
+games:*::frank
 users:*::
 nogroup:*::
 systemd-journal:!::
@@ -44,11 +44,11 @@ systemd-resolve:!::
 input:!::
 kvm:!::
 render:!::
-crontab:!::
+crontab:!::frank
 netdev:!::
 messagebus:!::
 ssh:!::
 systemd-coredump:!!::
 bind:!::
-mlocate:!::
+mlocate:!::frank
 _chrony:!::

diff --git a/gshadow- b/gshadow-
index 7ab0b533ea1688b6852df7a77de8ff22186eb835..6394cc6c2f952d7ff4ef217d45652c9090c243de 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -51,3 +51,4 @@ ssh:!::
 systemd-coredump:!!::
 bind:!::
 mlocate:!::
+_chrony:!::

diff --git a/locale.gen b/locale.gen
index df7c8a8dd6a983eb571ca4acaff6e2a9a57b4dad..3d48cb38d357f66f3bf620c7ff1b8fee9f6f5892 100644 (file)
--- a/locale.gen
+++ b/locale.gen
@@ -105,21 +105,21 @@
 # da_DK ISO-8859-1
 # da_DK.UTF-8 UTF-8
 # de_AT ISO-8859-1
-# de_AT.UTF-8 UTF-8
+de_AT.UTF-8 UTF-8
 # de_AT@euro ISO-8859-15
 # de_BE ISO-8859-1
-# de_BE.UTF-8 UTF-8
+de_BE.UTF-8 UTF-8
 # de_BE@euro ISO-8859-15
 # de_CH ISO-8859-1
-# de_CH.UTF-8 UTF-8
+de_CH.UTF-8 UTF-8
 # de_DE ISO-8859-1
-# de_DE.UTF-8 UTF-8
+de_DE.UTF-8 UTF-8
 # de_DE@euro ISO-8859-15
 # de_IT ISO-8859-1
 # de_IT.UTF-8 UTF-8
 # de_LI.UTF-8 UTF-8
 # de_LU ISO-8859-1
-# de_LU.UTF-8 UTF-8
+de_LU.UTF-8 UTF-8
 # de_LU@euro ISO-8859-15
 # doi_IN UTF-8
 # dsb_DE UTF-8
@@ -132,27 +132,27 @@
 # el_GR@euro ISO-8859-7
 # en_AG UTF-8
 # en_AU ISO-8859-1
-# en_AU.UTF-8 UTF-8
+en_AU.UTF-8 UTF-8
 # en_BW ISO-8859-1
 # en_BW.UTF-8 UTF-8
 # en_CA ISO-8859-1
-# en_CA.UTF-8 UTF-8
+en_CA.UTF-8 UTF-8
 # en_DK ISO-8859-1
 # en_DK.ISO-8859-15 ISO-8859-15
 # en_DK.UTF-8 UTF-8
 # en_GB ISO-8859-1
 # en_GB.ISO-8859-15 ISO-8859-15
-# en_GB.UTF-8 UTF-8
+en_GB.UTF-8 UTF-8
 # en_HK ISO-8859-1
-# en_HK.UTF-8 UTF-8
+en_HK.UTF-8 UTF-8
 # en_IE ISO-8859-1
-# en_IE.UTF-8 UTF-8
+en_IE.UTF-8 UTF-8
 # en_IE@euro ISO-8859-15
 # en_IL UTF-8
 # en_IN UTF-8
 # en_NG UTF-8
 # en_NZ ISO-8859-1
-# en_NZ.UTF-8 UTF-8
+ en_NZ.UTF-8 UTF-8
 # en_PH ISO-8859-1
 # en_PH.UTF-8 UTF-8
 # en_SC.UTF-8 UTF-8
@@ -160,9 +160,9 @@
 # en_SG.UTF-8 UTF-8
 # en_US ISO-8859-1
 # en_US.ISO-8859-15 ISO-8859-15
-# en_US.UTF-8 UTF-8
+en_US.UTF-8 UTF-8
 # en_ZA ISO-8859-1
-# en_ZA.UTF-8 UTF-8
+en_ZA.UTF-8 UTF-8
 # en_ZM UTF-8
 # en_ZW ISO-8859-1
 # en_ZW.UTF-8 UTF-8

diff --git a/motd b/motd
index 0c87dd33ed0cfd1bbb41916f54707eb5e24b901a..8f6bd2792e85a96979bdb989b1bdcdf68e12a98b 100644 (file)
--- a/motd
+++ b/motd
@@ -1,7 +1,12 @@
+Debian GNU/Linux 10 (buster)
+ _   _      _             
+| | | | ___| | __ _  __ _ 
+| |_| |/ _ \ |/ _` |/ _` |
+|  _  |  __/ | (_| | (_| |
+|_| |_|\___|_|\__, |\__,_|
+              |___/       
 
-The programs included with the Debian GNU/Linux system are free software;
-the exact distribution terms for each program are described in the
-individual files in /usr/share/doc/*/copyright.
+Bildung ist das was übrig bleibt, wenn man alles andere vergessen hat.
+
+Today is Pungenday, the 25th day of Discord in the YOLD 3187
 
-Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
-permitted by applicable law.

diff --git a/motd.orig b/motd.orig
new file mode 100644 (file)
index 0000000..0c87dd3
--- /dev/null
+++ b/motd.orig
@@ -0,0 +1,7 @@
+
+The programs included with the Debian GNU/Linux system are free software;
+the exact distribution terms for each program are described in the
+individual files in /usr/share/doc/*/copyright.
+
+Debian GNU/Linux comes with ABSOLUTELY NO WARRANTY, to the extent
+permitted by applicable law.

diff --git a/passwd b/passwd
index 73bd5bf65e1037dd149815dff0dfcfb502526164..c693360bbd0c20aecba39dd1155f5609a6112656 100644 (file)
--- a/passwd
+++ b/passwd
@@ -25,3 +25,4 @@ sshd:x:105:65534::/run/sshd:/usr/sbin/nologin
 systemd-coredump:x:999:999:systemd Core Dumper:/:/usr/sbin/nologin
 bind:x:106:112::/var/cache/bind:/usr/sbin/nologin
 _chrony:x:107:114:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin
+frank:x:1017:100:Frank Brehm:/home/frank:/bin/bash

diff --git a/passwd- b/passwd-
index 4926c442ed220564c0d9262249bb0e43abc1542b..73bd5bf65e1037dd149815dff0dfcfb502526164 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -24,4 +24,4 @@ messagebus:x:104:110::/nonexistent:/usr/sbin/nologin
 sshd:x:105:65534::/run/sshd:/usr/sbin/nologin
 systemd-coredump:x:999:999:systemd Core Dumper:/:/usr/sbin/nologin
 bind:x:106:112::/var/cache/bind:/usr/sbin/nologin
-_chrony:x:107:114::/var/lib/chrony:/usr/sbin/nologin
+_chrony:x:107:114:Chrony daemon,,,:/var/lib/chrony:/usr/sbin/nologin

diff --git a/shadow b/shadow
index 1db31818dbf225c27d72a1a273c6b5f2efaa2e88..c4c86762ad4518c7ff9cbbd3143c5203dfdc52ba 100644 (file)
--- a/shadow
+++ b/shadow
@@ -25,3 +25,4 @@ sshd:*:18686:0:99999:7:::
 systemd-coredump:!!:18686::::::
 bind:*:18724:0:99999:7:::
 _chrony:*:18724:0:99999:7:::
+frank:$6$viYRDmzFELF5pfeZ$5RbMmTp6m9ddM/PneWLQxNBPmk1S3VDCSMGHacsZQkzaPil449Ln01NmpsSCYVlqWjF2uzpxmMSUxbRwnigo6.:18725:0:99999:7:::

diff --git a/skel/.bash_logout b/skel/.bash_logout
index de4f5f75d7ccd3a5b62bd2ce683ed678a5cb72c2..2152d926793f180ff260f67d6284e6f43e6f8379 100644 (file)
--- a/skel/.bash_logout
+++ b/skel/.bash_logout
@@ -2,6 +2,6 @@
 
 # when leaving the console clear the screen to increase privacy
 
-if [ "$SHLVL" = 1 ]; then
-    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
-fi
+#if [ "$SHLVL" = 1 ]; then
+#    [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q
+#fi

diff --git a/skel/.bashrc b/skel/.bashrc
index 9360f69a747f3b5a267c108302a6a0bbb4f30986..6d42d5ff0c6b1c3cebb7d8f85e820d164a69c331 100644 (file)
--- a/skel/.bashrc
+++ b/skel/.bashrc
@@ -8,21 +8,6 @@ case $- in
       *) return;;
 esac
 
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
 # If set, the pattern "**" used in a pathname expansion context will
 # match all files and zero or more directories and subdirectories.
 #shopt -s globstar
@@ -30,67 +15,14 @@ shopt -s checkwinsize
 # make less more friendly for non-text input files, see lesspipe(1)
 #[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-       # We have color support; assume it's compliant with Ecma-48
-       # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-       # a case would tend to support setf rather than setaf.)
-       color_prompt=yes
-    else
-       color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
 # If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    #alias grep='grep --color=auto'
-    #alias fgrep='fgrep --color=auto'
-    #alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# some more ls aliases
-#alias ll='ls -l'
-#alias la='ls -A'
-#alias l='ls -CF'
+#case "$TERM" in
+#xterm*|rxvt*)
+#    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+#    ;;
+#*)
+#    ;;
+#esac
 
 # Alias definitions.
 # You may want to put all your additions into a separate file like
@@ -101,13 +33,3 @@ if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
-  if [ -f /usr/share/bash-completion/bash_completion ]; then
-    . /usr/share/bash-completion/bash_completion
-  elif [ -f /etc/bash_completion ]; then
-    . /etc/bash_completion
-  fi
-fi

diff --git a/skel/.bashrc.orig b/skel/.bashrc.orig
new file mode 100644 (file)
index 0000000..9360f69
--- /dev/null
+++ b/skel/.bashrc.orig
@@ -0,0 +1,113 @@
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+       # We have color support; assume it's compliant with Ecma-48
+       # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+       # a case would tend to support setf rather than setaf.)
+       color_prompt=yes
+    else
+       color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    #alias grep='grep --color=auto'
+    #alias fgrep='fgrep --color=auto'
+    #alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+#alias ll='ls -l'
+#alias la='ls -A'
+#alias l='ls -CF'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi

diff --git a/subgid b/subgid
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f1ee3c172dbe9edb4a3ace1fde06dce15c3ed4d5 100644 (file)
--- a/subgid
+++ b/subgid
@@ -0,0 +1 @@
+frank:100000:65536

diff --git a/subgid- b/subgid-
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/subuid b/subuid
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f1ee3c172dbe9edb4a3ace1fde06dce15c3ed4d5 100644 (file)
--- a/subuid
+++ b/subuid
@@ -0,0 +1 @@
+frank:100000:65536

diff --git a/subuid- b/subuid-
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sudoers b/sudoers
index d4cc632b206859df4f4f5d55ab4813d0ca58358b..7f983d0f4cc47b88d2a635e56931e1431c338e33 100644 (file)
--- a/sudoers
+++ b/sudoers
@@ -17,10 +17,11 @@ Defaults    secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/b
 # Cmnd alias specification
 
 # User privilege specification
-root   ALL=(ALL:ALL) ALL
+root   ALL=(ALL:ALL) NOPASSWD: ALL
 
 # Allow members of group sudo to execute any command
 %sudo  ALL=(ALL:ALL) ALL
+%root  ALL=(ALL:ALL) NOPASSWD: ALL
 
 # See sudoers(5) for more information on "#include" directives: