4 Commits

Author SHA1 Message Date
Jay Larson
4a184e88bf Mainly just moved configs to new CONFIG directory format 2018-07-28 15:07:41 -05:00
Jay Larson
15d00b75ee The following changes were made:
* Modified snap-base/Makefile to work with /bin/sh
  * updated snap.conf to have templatedir in default config
2018-03-30 10:22:11 -05:00
Jay Larson
a57f57d229 The following changes were made:
* Added URL, REPO, and BRIEF to Makefile
  * Modified passwd with default shell of /bin/sh for root
2018-03-30 09:47:26 -05:00
Jay Larson
f473fde4ef The following changes were made:
* Now uses relative rather than absolute paths for symlinks
  * usher now uses /bin/sh
  * Added ids.default as start of tracking base system uids/gids
2017-12-10 15:17:47 -06:00
11 changed files with 139 additions and 49 deletions

49
CONFIG/etc/default/ids Normal file
View File

@@ -0,0 +1,49 @@
bin 1
lp 9
adm 16
atd 17 17
messagebus 18 18
lpadmin 19
named 20 20
gdm 21 21
apache 25 25
smmsp 26 26
polkitd 27 27
rpc 28 28
exim 31 31
postfix 32 32
postdrop 33
sendmail 34
mail 34
vmailman 35 35
news 36 36
kdm 37 37
mysql 40 40
postgres 41 41
dovecot 42 42
dovenull 43 43
ftp 45 45
proftpd 46 46
vsftpd 47 47
rsyncd 48 48
sshd 50 50
stunnel 51 51
svn 56 56
svntest 57
games 60 60
kvm 61
wireshark 62
lightdm 63 63
sddm 64 64
scanner 70
colord 71 71
ldap 83 83
avahi 84 84
avahi-autoipd 85 85
netdev 86
ntp 87 87
unbound 88 88
plugdev 90
anonymous 98
nobody 65534
nogroup 65534

View File

@@ -1,4 +1,4 @@
root:x:0:0:root:/root:/bin/bash
root:x:0:0:root:/root:/bin/sh
bin:x:1:1:bin:/dev/null:/bin/false
daemon:x:6:6:Daemon User:/dev/null:/bin/false
messagebus:x:18:18:D-Bus Message Daemon User:/var/run/dbus:/bin/false

7
CONFIG/etc/snap.conf Normal file
View File

@@ -0,0 +1,7 @@
[sources]
default = http://packages.snaplinux.org/ core dev main
[snapinstall]
templatedir = /etc/snap.d/templates
include /etc/snap.d

View File

@@ -10,13 +10,15 @@
DEPENDS =
ARCH = x86_64
URL =
URL = http://snaplinux.org/
REPO = core
BRIEF = Base system directories and files
DESC = Base system directories and files
ARCHIVE :=
SRCDIR := $(PWD)/SRC/snap-base
PATCHDIR := $(PWD)/SRC/patches
VERSION := 0.0alpha1-3
VERSION := 0.0alpha1-8
include /usr/share/snap/Makefile.snaplinux
@@ -33,4 +35,5 @@ clean:
@rm -rvf $(ROOT) \
$(SNAPINFO) \
$(MANIFEST) \
$(FILES)
$(FILES) \
$(CONFIG)

View File

@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
set -e
@@ -7,26 +7,6 @@ case $1 in
exit 0
;;
postinst)
if [ ! -f ${TARGET}/etc/bashrc ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/bashrc \
${TARGET}/etc/bashrc
fi
if [ ! -f ${TARGET}/etc/group ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/group \
${TARGET}/etc/group
fi
if [ ! -f ${TARGET}/etc/passwd ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/passwd \
${TARGET}/etc/passwd
fi
if [ ! -f ${TARGET}/etc/profile ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/profile \
${TARGET}/etc/profile
fi
if [ ! -f ${TARGET}/etc/snap.conf ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/snap.conf \
${TARGET}/etc/snap.conf
fi
if [ ! -f ${TARGET}/var/log/btmp ]; then
install -v -m 600 /dev/null ${TARGET}/var/log/btmp
fi

View File

@@ -1,46 +1,99 @@
install: base usr etc var lib snap
install: base usr etc var lib
base:
@install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc} && \
$(DESTDIR)/bin \
$(DESTDIR)/boot \
$(DESTDIR)/dev \
$(DESTDIR)/etc \
$(DESTDIR)/home \
$(DESTDIR)/lib \
$(DESTDIR)/media \
$(DESTDIR)/mnt \
$(DESTDIR)/opt \
$(DESTDIR)/proc && \
install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{run,sbin,srv,sys,usr,var} && \
$(DESTDIR)/run \
$(DESTDIR)/sbin \
$(DESTDIR)/srv \
$(DESTDIR)/sys \
$(DESTDIR)/usr \
$(DESTDIR)/var && \
install -v -d -m 0750 -o root -g root \
$(DESTDIR)/root && \
install -v -d -m 1777 $(DESTDIR)/tmp $(DESTDIR)/var/tmp
etc: base
@ln -sv /proc/mounts $(DESTDIR)/etc/mtab
@install -v -d -m 0755 -o root -g root $(DESTDIR)/etc/default && \
ln -sv ../proc/mounts $(DESTDIR)/etc/mtab
lib: usr
@ln -sv lib $(DESTDIR)/lib64 && \
ln -sv lib $(DESTDIR)/usr/lib64
snap: usr
install -v -d -m 0755 $(DESTDIR)/usr/share/snap-base && \
install -v -m 0644 bashrc $(DESTDIR)/usr/share/snap-base/bashrc && \
install -v -m 0644 group $(DESTDIR)/usr/share/snap-base/group && \
install -v -m 0644 passwd $(DESTDIR)/usr/share/snap-base/passwd && \
install -v -m 0644 profile $(DESTDIR)/usr/share/snap-base/profile && \
install -v -m 0644 snap.conf \
$(DESTDIR)/usr/share/snap-base/snap.conf && \
install -v -m 0644 snap_version $(DESTDIR)/etc/snap_version
usr: base
@install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}{bin,include,lib,sbin,src} && \
$(DESTDIR)/usr/bin \
$(DESTDIR)/usr/include \
$(DESTDIR)/usr/lib \
$(DESTDIR)/usr/sbin \
$(DESTDIR)/usr/src \
$(DESTDIR)/usr/local/bin \
$(DESTDIR)/usr/local/include \
$(DESTDIR)/usr/local/lib \
$(DESTDIR)/usr/local/sbin \
$(DESTDIR)/usr/local/src && \
install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}share/{color,dict,doc,info,locale} && \
$(DESTDIR)/usr/share/color \
$(DESTDIR)/usr/share/dict \
$(DESTDIR)/usr/share/doc \
$(DESTDIR)/usr/share/info \
$(DESTDIR)/usr/share/locale \
$(DESTDIR)/usr/local/share/color \
$(DESTDIR)/usr/local/share/dict \
$(DESTDIR)/usr/local/share/doc \
$(DESTDIR)/usr/local/share/info \
$(DESTDIR)/usr/local/share/locale && \
install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}share/{man,misc,terminfo,zoneinfo} && \
$(DESTDIR)/usr/share/man \
$(DESTDIR)/usr/share/misc \
$(DESTDIR)/usr/share/terminfo \
$(DESTDIR)/usr/share/zoneinfo \
$(DESTDIR)/usr/local/share/man \
$(DESTDIR)/usr/local/share/misc \
$(DESTDIR)/usr/local/share/terminfo \
$(DESTDIR)/usr/local/share/zoneinfo && \
install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{libexec,{,local/}share/man/man{1..8}}
$(DESTDIR)/usr/libexec \
$(DESTDIR)/usr/share/man/man1 \
$(DESTDIR)/usr/share/man/man2 \
$(DESTDIR)/usr/share/man/man3 \
$(DESTDIR)/usr/share/man/man4 \
$(DESTDIR)/usr/share/man/man5 \
$(DESTDIR)/usr/share/man/man6 \
$(DESTDIR)/usr/share/man/man7 \
$(DESTDIR)/usr/share/man/man8 \
$(DESTDIR)/usr/local/share/man/man1 \
$(DESTDIR)/usr/local/share/man/man2 \
$(DESTDIR)/usr/local/share/man/man3 \
$(DESTDIR)/usr/local/share/man/man4 \
$(DESTDIR)/usr/local/share/man/man5 \
$(DESTDIR)/usr/local/share/man/man6 \
$(DESTDIR)/usr/local/share/man/man7 \
$(DESTDIR)/usr/local/share/man/man8
var: base
@install -v -d -m 0755 -o root -g root \
$(DESTDIR)/var/{log,mail,spool} && \
$(DESTDIR)/var/log \
$(DESTDIR)/var/mail \
$(DESTDIR)/var/spool && \
install -v -d -m 0755 -o root -g root \
$(DESTDIR)/var/{opt,cache,lib/{color,misc,locate},local} && \
ln -sv /run $(DESTDIR)/var/run && \
ln -sv /run/lock $(DESTDIR)/var/lock
$(DESTDIR)/var/opt \
$(DESTDIR)/var/cache \
$(DESTDIR)/var/lib/color \
$(DESTDIR)/var/lib/misc \
$(DESTDIR)/var/lib/locate \
$(DESTDIR)/var/local && \
ln -sv ../run $(DESTDIR)/var/run && \
ln -sv ../run/lock $(DESTDIR)/var/lock

View File

@@ -1,2 +0,0 @@
[sources]
default = http://packages.snaplinux.org/ core dev main