some minor fixes, updates, etc. and blank manual so far

This commit is contained in:
2016-12-01 12:47:23 -05:00
parent 6f3e812d35
commit b3bb0391c8
11 changed files with 383 additions and 39 deletions

View File

@@ -69,27 +69,29 @@ desc = j00 got 0wnz0r3d lulz.
uri = https://bdisk.square-r00t.net
; Should the root user have a password? IF THIS IS NOT SET,
; PASSWORD LOGIN WILL BE DISABLED!
; If you wish to have a blank password, use the string:
; PASSWORD LOGIN WILL BE DISABLED! If you wish to have a
; blank password, use the string:
; BLANK
; Do NOT use a plaintext password here. You will need to
; generate a salted and hashed string in a
; shadow-compatible format.
; If you need help generating one, see docs/HOWTO.hashgen.
; generate a salted and hashed string in a shadow-compatible
; format. If you need help generating one, see docs/HOWTO.hashgen.
; If an assistance script is available, the path will be given
; (i.e. extras/bin/hashgen.py).
;
; Note that if you want an automatic login, this is NOT where
; it would be set. It should instead be controlled via:
; Note that if you want an automatic login, this is NOT where it
; would be set. It should instead be controlled via:
; overlay/etc/systemd/system/getty@ttyN.service.d/autologin.conf
; In the following format:
; [Service]
; Type=idle
; ExecStart=
; ExecStart=-/usr/bin/agetty --autologin <USERNAME> --noclear %I 38400 linux
;(where N is the TTY number). Alternatively, if booting to a GUI,
; it can be set as according to that GUI (e.g. for LXDE,
;(where N is the TTY number). Alternatively, if booting to a GUI, it
; can be set as according to that GUI (e.g. for LXDE,
; overlay/etc/lxdm/lxdm.conf, "autologin=<USERNAME>")
; 0.) MUST be a salted SHA512 string in shadow format
; 1.) ALL $'s (there should be three of them) MUST be escaped with a second $.
; e.g.: $6$aBcDeFgHiJ$ZxYw.... would become $$6$$aBcDeFgHiJ$$ZxYw...
root_password =
; Should we create a non-root user on the image?

View File

@@ -1,6 +1,6 @@
Server = http://mirrors.advancedhosters.com/archlinux/$repo/os/$arch
Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch
Server = http://il.mirrors.linaxe.net/archlinux/$repo/os/$arch
Server = http://mirror.grig.io/archlinux/$repo/os/$arch
Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch
Server = http://arch.mirrors.ionfish.org/$repo/os/$arch
Server = http://cosmos.cites.illinois.edu/pub/archlinux/$repo/os/$arch
Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
Server = http://mirror.metrocast.net/archlinux/$repo/os/$arch
Server = http://mirror.jmu.edu/pub/archlinux/$repo/os/$arch

View File

@@ -1,8 +1,17 @@
# Configuration for resolvconf(8)
# See resolvconf.conf(5) for details
resolv_conf=/etc/resolv.conf
# If you run a local name server, you should uncomment the below line and
# configure your subscribers configuration files below.
#name_servers=127.0.0.1
append_nameservers='4.2.2.1 4.2.2.2 4.2.2.3'
#name_servers='2620:0:ccc::2 2620:0:ccd::2 4.2.2.1 4.2.2.2 127.0.0.1 ::1 '
name_servers='4.2.2.1 4.2.2.2 208.67.220.220 2620:0:ccc::2 2072620:0:ccd::2 208.67.222.222 208.67.222.220 208.67.220.222'
# Write out dnsmasq extended configuration and resolv files
#dnsmasq_conf=/etc/dnsmasq.d/openresolv.conf
#dnsmasq_resolv=/etc/dnsmasq.resolv.conf
domain=square-r00t.net
search_domains=square-r00t.net

View File

@@ -4,20 +4,7 @@
dirmngr </dev/null > /dev/null 2>&1
# Import settings.
if [[ -f /root/VARS.txt ]];
then
source /root/VARS.txt
else
# TODO: do these defaults via the config stuff in python instead.
export DISTNAME='BDISK'
export UXNAME='bdisk'
export PNAME='BDisk'
export DISTPUB='r00t^2'
export DISTDESC='j00 got 0wnz0r3d lulz.'
export REGUSR="${UXNAME}"
export REGUSR_PASS=''
export ROOT_PASS=''
fi
source /root/VARS.txt
# Logging!
exec 3>&1 4>&2
@@ -154,3 +141,4 @@ rm -f /root/.viminfo
rm -f /root/apacman-*.pkg.tar.xz
rm -f /root/pre-build.sh
pkill -9 dirmngr
pkill -9 gpg-agent

View File

@@ -1,8 +1,8 @@
export DISTNAME={{ bdisk['name']|upper }}
export UXNAME={{ bdisk['name']|lower }}
export PNAME={{ bdisk['name'] }}
export DISTPUB={{ bdisk['dev'] }}
export DISTDESC={{ bdisk['desc'] }}
export REGUSR={{ bdisk['name']|lower }}
export REGUSR_PASS={{ bdisk['usr_pass'] }}
export ROOT_PASS={{ bdisk['root_pass'] }}
export DISTNAME='{{ bdisk['name']|upper }}'
export UXNAME='{{ bdisk['name']|lower }}'
export PNAME='{{ bdisk['name'] }}'
export DISTPUB='{{ bdisk['dev'] }}'
export DISTDESC='{{ bdisk['desc'] }}'
export REGUSR='{{ bdisk['name']|lower }}'
export REGUSR_PASS='{{ bdisk['usr_pass'] }}'
export ROOT_PASS='{{ bdisk['root_pass'] }}'