From 8b7a8ebc8c670a64399cb6471e76d8d3f87ed120 Mon Sep 17 00:00:00 2001 From: r00t Date: Fri, 30 Dec 2016 20:45:18 -0500 Subject: [PATCH] oops again --- .gitignore | 2 +- overlay/etc/bash.bashrc | 64 ------------------- overlay/etc/lxdm/lxdm.conf | 62 ------------------ ...bus-org.freedesktop.NetworkManager.service | 1 - ...dbus-org.freedesktop.nm-dispatcher.service | 1 - .../getty@tty1.service.d/autologin.conf | 5 -- .../openvpn-client@client.service | 1 - .../multi-user.target.wants/sshd.service | 1 - overlay/etc/vimrc | 22 ------- 9 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 overlay/etc/bash.bashrc delete mode 100644 overlay/etc/lxdm/lxdm.conf delete mode 120000 overlay/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service delete mode 120000 overlay/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service delete mode 100644 overlay/etc/systemd/system/getty@tty1.service.d/autologin.conf delete mode 120000 overlay/etc/systemd/system/multi-user.target.wants/openvpn-client@client.service delete mode 120000 overlay/etc/systemd/system/multi-user.target.wants/sshd.service delete mode 100644 overlay/etc/vimrc diff --git a/.gitignore b/.gitignore index d0c22f1..9067ca8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.bak # These are user-controlled. -#/overlay/* +/overlay !/overlay/x86_64 !/overlay/i686 !/overlay/etc/ diff --git a/overlay/etc/bash.bashrc b/overlay/etc/bash.bashrc deleted file mode 100644 index 449a7b5..0000000 --- a/overlay/etc/bash.bashrc +++ /dev/null @@ -1,64 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' - - ;; - screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' - ;; -esac - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion - -alias vi='/usr/bin/vim' -export EDITOR="vim" - -if [ -f ~/.bashrc ]; -then - source ~/.bashrc -fi -if [ -d ~/bin ]; -then - export PATH="$PATH:~/bin" -fi - -alias grep='grep --color' -alias egrep='egrep --color' - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' - -export HISTTIMEFORMAT="%F %T " -export PATH="${PATH}:/sbin:/bin:/usr/sbin" - -DEFROUTEIF=$(ip route show | egrep '^default' | awk '{print $5}') - -echo -echo "===================================" -date -if [ -n "${DEFROUTEIF}" ]; -then - IPADDR=$(ip a s dev ${DEFROUTEIF} | egrep '^[[:space:]]*inet\ ' | awk '{print $2}' | cut -f1 -d"/") - HWADDR=$(ip l show dev ${DEFROUTEIF} | egrep '^[[:space:]]*link' | awk '{print $2}') - echo - echo -n "${DEFROUTEIF} (${HWADDR}) is: ${IPADDR}" -fi -echo -echo -n "tun0 is: " -ifconfig tun0 | grep inet | grep -v "inet6" | awk '{print $2}' -echo -echo "http://bdisk.square-r00t.net/" -echo "===================================" -echo diff --git a/overlay/etc/lxdm/lxdm.conf b/overlay/etc/lxdm/lxdm.conf deleted file mode 100644 index 0bf1b07..0000000 --- a/overlay/etc/lxdm/lxdm.conf +++ /dev/null @@ -1,62 +0,0 @@ -[base] -## uncomment and set autologin username to enable autologin -#autologin=bdisk - -## uncomment and set timeout to enable timeout autologin, -## the value should >=5 -# timeout=10 - -## default session or desktop used when no systemwide config -# session=/usr/bin/startlxde - -## uncomment and set to set numlock on your keyboard -# numlock=0 - -## set this if you don't want to put xauth file at ~/.Xauthority -# xauth_path=/tmp - -# not ask password for users who have empty password -# skip_password=1 - -## greeter used to welcome the user -greeter=/usr/lib/lxdm/lxdm-greeter-gtk - -[server] -## arg used to start xserver, not fully function -arg=/usr/bin/X -background vt1 -# uncomment this if you really want xserver listen to tcp -# tcp_listen=1 -# uncoment this if you want reset the xserver after logou -# reset=1 - -[display] -## gtk theme used by greeter -gtk_theme=Clearlooks - -## background of the greeter -# bg=/usr/share/backgrounds/default.png - -## if show bottom pane -bottom_pane=1 - -## if show language select control -lang=1 - -## if show keyboard layout select control -keyboard=0 - -## the theme of greeter -theme=Industrial - -[input] - -[userlist] -## if disable the user list control at greeter -disable=0 - -## whitelist user -white= - -## blacklist user -black= - diff --git a/overlay/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service b/overlay/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service deleted file mode 120000 index e874a9b..0000000 --- a/overlay/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager.service \ No newline at end of file diff --git a/overlay/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service b/overlay/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service deleted file mode 120000 index a7e5cd4..0000000 --- a/overlay/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/NetworkManager-dispatcher.service \ No newline at end of file diff --git a/overlay/etc/systemd/system/getty@tty1.service.d/autologin.conf b/overlay/etc/systemd/system/getty@tty1.service.d/autologin.conf deleted file mode 100644 index 5ca0405..0000000 --- a/overlay/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ /dev/null @@ -1,5 +0,0 @@ -#[Service] -##Type=simple -#Type=idle -#ExecStart= -#ExecStart=-/usr/bin/agetty --autologin bdisk --noclear %I 38400 linux diff --git a/overlay/etc/systemd/system/multi-user.target.wants/openvpn-client@client.service b/overlay/etc/systemd/system/multi-user.target.wants/openvpn-client@client.service deleted file mode 120000 index 8719131..0000000 --- a/overlay/etc/systemd/system/multi-user.target.wants/openvpn-client@client.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/openvpn-client@.service \ No newline at end of file diff --git a/overlay/etc/systemd/system/multi-user.target.wants/sshd.service b/overlay/etc/systemd/system/multi-user.target.wants/sshd.service deleted file mode 120000 index d21ebd9..0000000 --- a/overlay/etc/systemd/system/multi-user.target.wants/sshd.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/sshd.service \ No newline at end of file diff --git a/overlay/etc/vimrc b/overlay/etc/vimrc deleted file mode 100644 index f9f8a91..0000000 --- a/overlay/etc/vimrc +++ /dev/null @@ -1,22 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just -" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing archlinux.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! archlinux.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - -set number -syntax on -set paste -if has("autocmd") - au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif -endif