2016-09: Retroactive Updates
* Display Manager
* nodm removed due to a dbus issue
* Hopefully if Xorg can’t be run it will default to CLI
* XFCE is now started by .zlogin
* Removed the "Save Session" checkbox
* Networking
* Replaced NetworkManager with systemd-networkd
* networkd had a 33% faster boot time than NetworkManager (-10s)
* It also more directly prioritizes wired connections
* NOTES: This removed the ability to easily connect to new networks
* This is okay as the WiFi changes very infrequently
* The WiFi settings are loaded from the UFD directly
* Added linux-firmware to support more network devices
* broadcom-wl wouldn't compile under i686 so it's x64 only ATM
* Removed the udev rule forcing the dhcp delay during boot
* Server IPs updated
* Config files and wallpapers moved to <UFD>/config
* Fixed an issue where SMART was misreporting drives as bad
* When a drive failed SMART, subsequent drives would always report "NS"
This commit is contained in:
Alan Mason
parent
f67cd37a38
commit
3bf0f54b1a
28 changed files with 121 additions and 73 deletions
7
archlive/airootfs/etc/netctl/interfaces/wl-any
Normal file
7
archlive/airootfs/etc/netctl/interfaces/wl-any
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
#!/bin/bash
|
||||
for interface in /sys/class/net/wl*; do
|
||||
break
|
||||
done
|
||||
|
||||
Interface=$(basename $interface)
|
||||
echo "wl-any: using interface $Interface"
|
||||
6
archlive/airootfs/etc/netctl/wireless
Normal file
6
archlive/airootfs/etc/netctl/wireless
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
Description='A wpa_supplicant configuration file based wireless connection'
|
||||
Interface=wl-any
|
||||
Connection=wireless
|
||||
Security=wpa-config
|
||||
WPAConfigFile='/run/archiso/bootmnt/config/wifi.conf'
|
||||
IP=dhcp
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
# nodm configuration file
|
||||
|
||||
# Controls the user that is used to automatically log in
|
||||
NODM_USER='wktech'
|
||||
|
||||
# Options to pass to the X server (for example: "vt7 -nolisten tcp")
|
||||
NODM_X_OPTIONS='vt7 -nolisten tcp'
|
||||
|
||||
# Minimum time (in seconds) that a session should last in order for nodm to
|
||||
# decide that it has not quit too soon. If an X session will run for less than
|
||||
# this time, nodm will wait an increasing bit of time before restarting it.
|
||||
NODM_MIN_SESSION_TIME=60
|
||||
|
||||
# Restart session after it ending?
|
||||
NODM_RESTART_SESSION=0
|
||||
|
||||
# Path to the xinit program
|
||||
NODM_XINIT='/usr/bin/xinit'
|
||||
|
||||
# Path to the X session script (useful if using xinit instead of startx).
|
||||
# NOTE: This file needs to be executable!
|
||||
NODM_XSESSION='/home/wktech/.xinitrc'
|
||||
5
archlive/airootfs/etc/pam.d/nodm
Normal file
5
archlive/airootfs/etc/pam.d/nodm
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
#%PAM-1.0
|
||||
|
||||
auth include system-login
|
||||
account include system-login
|
||||
password include system-login
|
||||
8
archlive/airootfs/etc/resolv.conf
Normal file
8
archlive/airootfs/etc/resolv.conf
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
nameserver 8.8.8.8
|
||||
nameserver 8.8.4.4
|
||||
#nameserver 2001:4860:4860::8888
|
||||
#nameserver 2001:4860:4860::8844
|
||||
nameserver 208.67.222.222
|
||||
nameserver 208.67.220.220
|
||||
#nameserver 2620:0:ccc::2
|
||||
#nameserver 2620:0:ccd::2
|
||||
|
|
@ -45,7 +45,6 @@
|
|||
</property>
|
||||
<property name="plugin-8" type="string" value="systray">
|
||||
<property name="names-visible" type="array">
|
||||
<value type="string" value="networkmanager applet"/>
|
||||
<value type="string" value="xfce4-power-manager"/>
|
||||
<value type="string" value="task manager"/>
|
||||
<value type="string" value="notes"/>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@
|
|||
<property name="LaunchGNOME" type="bool" value="true"/>
|
||||
</property>
|
||||
<property name="shutdown" type="empty">
|
||||
<property name="ShowSuspend" type="bool" value="false"/>
|
||||
<property name="ShowHibernate" type="bool" value="false"/>
|
||||
<property name="ShowLogout" type="bool" value="false"/>
|
||||
<property name="ShowSuspend" type="bool" value="false"/>
|
||||
</property>
|
||||
</channel>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
CONKY_RC="$HOME/.conkyrc"
|
||||
if [[ -f "/run/archiso/bootmnt/arch/conky.rc" ]]; then
|
||||
CONKY_RC="/run/archiso/bootmnt/arch/conky.rc"
|
||||
if [[ -f "/run/archiso/bootmnt/config/conky.rc" ]]; then
|
||||
CONKY_RC="/run/archiso/bootmnt/config/conky.rc"
|
||||
fi
|
||||
|
||||
sleep 2s && conky -c "${CONKY_RC}" -dq
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ own_window yes
|
|||
own_window_type normal
|
||||
own_window_transparent no
|
||||
own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky
|
||||
own_window_colour 421114
|
||||
own_window_colour 000000
|
||||
own_window_class Conky
|
||||
#own_window_title Bunsen Labs Default Conky
|
||||
own_window_title Default Conky
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
sudo systemctl start NetworkManager
|
||||
connect-to-network
|
||||
|
||||
|
|
|
|||
|
|
@ -24,4 +24,6 @@ eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
|
|||
export SSH_AUTH_SOCK
|
||||
|
||||
# Start Xfce4
|
||||
exec startxfce4
|
||||
if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then
|
||||
exec startxfce4
|
||||
fi
|
||||
|
|
|
|||
29
archlive/airootfs/etc/skel/.zlogin
Normal file
29
archlive/airootfs/etc/skel/.zlogin
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
#!/bin/sh
|
||||
|
||||
userresources=$HOME/.Xresources
|
||||
usermodmap=$HOME/.Xmodmap
|
||||
sysresources=/etc/X11/xinit/.Xresources
|
||||
sysmodmap=/etc/X11/xinit/.Xmodmap
|
||||
|
||||
# merge in defaults and keymaps
|
||||
if [ -f $sysresources ]; then
|
||||
xrdb -merge $sysresources
|
||||
fi
|
||||
if [ -f $sysmodmap ]; then
|
||||
xmodmap $sysmodmap
|
||||
fi
|
||||
if [ -f "$userresources" ]; then
|
||||
xrdb -merge "$userresources"
|
||||
fi
|
||||
if [ -f "$usermodmap" ]; then
|
||||
xmodmap "$usermodmap"
|
||||
fi
|
||||
|
||||
# Start GNOME-Keyring
|
||||
eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
|
||||
export SSH_AUTH_SOCK
|
||||
|
||||
# Start Xfce4
|
||||
if [ -z "$DISPLAY" ] && [ "$(fgconsole)" -eq 1 ]; then
|
||||
exec startxfce4
|
||||
fi
|
||||
9
archlive/airootfs/etc/systemd/network/wired.network
Normal file
9
archlive/airootfs/etc/systemd/network/wired.network
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
[Match]
|
||||
Name=en*
|
||||
|
||||
[Network]
|
||||
DHCP=ipv4
|
||||
DNS=8.8.8.8
|
||||
DNS=8.8.4.4
|
||||
DNS=208.67.222.222
|
||||
DNS=208.67.220.220
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
[Unit]
|
||||
Description=Network Manager
|
||||
Wants=network.target
|
||||
After=network-pre.target dbus.service
|
||||
Before=network.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
PIDFile=/var/run/NetworkManager.pid
|
||||
BusName=org.freedesktop.NetworkManager
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
ExecStart=/usr/bin/NetworkManager --pid-file=/var/run/NetworkManager.pid --no-daemon
|
||||
REstart=on-failure
|
||||
# NM doesn't want systemd to kill its children for it
|
||||
KillMode=process
|
||||
CapabilityBoundingSet=CAP_NET_ADMIN CAP_DAC_OVERRIDE CAP_NET_RAW CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_MODULE CAP_AUDIT_WRITE CAP_KILL CAP_SYS_CHROOT
|
||||
ProtectSystem=true
|
||||
ProtectHome=read-only
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Alias=dbus-org.freedesktop.NetworkManager.service
|
||||
Also=NetworkManager-dispatcher.service
|
||||
|
|
@ -1 +0,0 @@
|
|||
/usr/lib/systemd/system/NetworkManager-dispatcher.service
|
||||
|
|
@ -1 +0,0 @@
|
|||
/usr/lib/systemd/system/nodm.service
|
||||
|
|
@ -0,0 +1 @@
|
|||
/usr/lib/systemd/system/systemd-networkd.service
|
||||
|
|
@ -0,0 +1 @@
|
|||
/usr/lib/systemd/system/systemd-networkd.socket
|
||||
|
|
@ -1 +0,0 @@
|
|||
ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service"
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
KEYMAP=us
|
||||
FONT=ter-u16n
|
||||
FONT_MAP=8859-2
|
||||
|
|
|
|||
3
archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc
Normal file
3
archlive/airootfs/etc/xdg/xfce4/kiosk/kioskrc
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
[xfce4-session]
|
||||
SaveSession=None
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ echo "root:Abracadabra" | chpasswd
|
|||
groupadd -r autologin
|
||||
|
||||
# Add wktech user
|
||||
useradd -m -s /bin/zsh -G autologin,storage,wheel -U wktech
|
||||
useradd -m -s /bin/zsh -G autologin,power,storage,wheel -U wktech
|
||||
echo "wktech:Abracadabra" | chpasswd
|
||||
|
||||
# Enable sudo for %wheel
|
||||
|
|
@ -42,6 +42,24 @@ sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' /etc/systemd/logind.conf
|
|||
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' /etc/systemd/logind.conf
|
||||
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' /etc/systemd/logind.conf
|
||||
|
||||
# DNS Settings
|
||||
#echo "nameserver 8.8.8.8" > /etc/resolv.conf
|
||||
#echo "nameserver 8.8.4.4" >> /etc/resolv.conf
|
||||
#echo "nameserver 2001:4860:4860::8888" >> /etc/resolv.conf
|
||||
#echo "nameserver 2001:4860:4860::8844" >> /etc/resolv.conf
|
||||
#echo "nameserver 208.67.222.222" >> /etc/resolv.conf
|
||||
#echo "nameserver 208.67.220.220" >> /etc/resolv.conf
|
||||
#echo "nameserver 2620:0:ccc::2" >> /etc/resolv.conf
|
||||
#echo "nameserver 2620:0:ccd::2" >> /etc/resolv.conf
|
||||
|
||||
# Startup settings
|
||||
#systemctl set-default multi-user.target
|
||||
systemctl set-default graphical.target
|
||||
systemctl set-default multi-user.target
|
||||
#systemctl set-default graphical.target
|
||||
|
||||
# archiso cleanup
|
||||
for file in /etc/systemd/system/{pacman-init.service,etc-pacman.d-gnupg.mount} /etc/systemd/scripts/choose-mirror /etc/udev/rules.d/81-dhcpcd.rules /etc/initcpio; do
|
||||
if [ -e "$file" ]; then
|
||||
rm "$file" -R
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ die () {
|
|||
}
|
||||
|
||||
# Load settings
|
||||
if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/arch/arch.conf" || \
|
||||
if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/config/arch.conf" || \
|
||||
die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
|
||||
else
|
||||
source "/usr/local/bin/arch.conf" || \
|
||||
|
|
@ -48,7 +48,7 @@ if ! ip a | grep -Eq '(192.168|10.[0-9]+).[0-9]+.[0-9]+'; then
|
|||
## Skip if we're already connected (i.e. the code above worked)
|
||||
if ! ip a | grep -Eq '(192.168|10.[0-9]+).[0-9]+.[0-9]+'; then
|
||||
echo "Attempting to connect to ${WIFI_SSID}..."
|
||||
nmcli dev wifi con "${WIFI_SSID}" password "${WIFI_PASS}"
|
||||
netctl start wireless
|
||||
sleep 5s
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ die () {
|
|||
}
|
||||
|
||||
# Load settings
|
||||
if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/arch/arch.conf" || \
|
||||
if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/config/arch.conf" || \
|
||||
die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
|
||||
else
|
||||
source "/usr/local/bin/arch.conf" || \
|
||||
|
|
@ -288,9 +288,9 @@ fi
|
|||
# SMART
|
||||
if [[ "$TEST_SMART" == "True" ]]; then
|
||||
clear
|
||||
SMART_ERRORS="False"
|
||||
echo "Checking SMART status..."
|
||||
for d in "${DRIVES[@]}"; do
|
||||
SMART_ERRORS="False"
|
||||
tmp_device="${d##*/}"
|
||||
eval "${tmp_device}_smart_result=Working"
|
||||
inxi -Dxx | grep "/dev/${tmp_device}" | sed -r "s#.*/dev/${tmp_device} (.*)# \1#" > "${tmp_device}_report.out"
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ die () {
|
|||
}
|
||||
|
||||
# Load settings
|
||||
if [[ -f "/run/archiso/bootmnt/arch/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/arch/arch.conf" || \
|
||||
if [[ -f "/run/archiso/bootmnt/config/arch.conf" ]]; then
|
||||
source "/run/archiso/bootmnt/config/arch.conf" || \
|
||||
die "ERROR: ARCH_WK media may be damaged. Please reboot or try another UFD"
|
||||
else
|
||||
source "/usr/local/bin/arch.conf" || \
|
||||
|
|
|
|||
9
archlive/airootfs/usr/local/bin/wifi.conf
Normal file
9
archlive/airootfs/usr/local/bin/wifi.conf
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
ctrl_interface=/var/run/wpa_supplicant
|
||||
eapol_version=1
|
||||
ap_scan=1
|
||||
fast_reauth=1
|
||||
network={
|
||||
ssid="SomeWiFi"
|
||||
psk="Abracadabra"
|
||||
priority=5
|
||||
}
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
arch-install-scripts
|
||||
aic94xx-firmware
|
||||
alsa-utils
|
||||
antiword
|
||||
arc-icon-theme-git
|
||||
b43-fwcutter
|
||||
b43-firmware
|
||||
btrfs-progs
|
||||
chntpw
|
||||
clonezilla
|
||||
|
|
@ -40,6 +41,7 @@ hdparm
|
|||
hexedit
|
||||
hfsprogs
|
||||
htop
|
||||
ifplugd
|
||||
inxi
|
||||
ipw2100-fw
|
||||
ipw2200-fw
|
||||
|
|
@ -49,6 +51,7 @@ lftp
|
|||
libewf
|
||||
librsvg
|
||||
linux-atm
|
||||
linux-firmware
|
||||
lm_sensors
|
||||
lsscsi
|
||||
mc
|
||||
|
|
@ -64,19 +67,15 @@ mtools
|
|||
mupdf
|
||||
ncdu
|
||||
ndisc6
|
||||
network-manager-applet
|
||||
networkmanager
|
||||
nfs-utils
|
||||
nilfs-utils
|
||||
nmap
|
||||
nodm
|
||||
noto-fonts
|
||||
ntfs-3g
|
||||
ntp
|
||||
numix-circle-icon-theme-git
|
||||
openconnect
|
||||
openssh
|
||||
openvpn
|
||||
p7zip
|
||||
partclone
|
||||
parted
|
||||
|
|
@ -109,9 +108,9 @@ unzip
|
|||
usb_modeswitch
|
||||
vim
|
||||
vpnc
|
||||
wd719x-firmware
|
||||
wget
|
||||
wireless_tools
|
||||
wpa_actiond
|
||||
wpa_supplicant
|
||||
wvdial
|
||||
xf86-input-synaptics
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
broadcom-wl
|
||||
gputest
|
||||
|
|
|
|||
Loading…
Reference in a new issue