4 Commits

Author SHA1 Message Date
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
Jay Larson
ab041cd8ef Corrected incorrect DESTDIR variables in usher (should be TARGET) 2017-05-18 19:23:19 -05:00
Jay Larson
4cec71bfbb Added missing /sys to SRC Makefile 2017-05-18 18:46:40 -05:00
Jay Larson
aeb36acc25 The following changes were made:
* moved files out of unnecessasry directories
  * snap_version is now managed by this package
  * added /etc/mtab
  * added /var/log/{btmp,lastlog,wtmp}
2017-05-17 09:17:39 -05:00
11 changed files with 103 additions and 41 deletions

View File

@@ -16,7 +16,7 @@ DESC = Base system directories and files
ARCHIVE := ARCHIVE :=
SRCDIR := $(PWD)/SRC/snap-base SRCDIR := $(PWD)/SRC/snap-base
PATCHDIR := $(PWD)/SRC/patches PATCHDIR := $(PWD)/SRC/patches
VERSION := 0.0alpha1-0 VERSION := 0.0alpha1-5
include /usr/share/snap/Makefile.snaplinux include /usr/share/snap/Makefile.snaplinux

49
SNAP/ids.default 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 @@
#!/bin/bash #!/bin/sh
set -e set -e
@@ -7,7 +7,6 @@ case $1 in
exit 0 exit 0
;; ;;
postinst) postinst)
if [[ ${TARGET} ]]; then
if [ ! -f ${TARGET}/etc/bashrc ]; then if [ ! -f ${TARGET}/etc/bashrc ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/bashrc \ install -m 0644 ${TARGET}/usr/share/snap-base/bashrc \
${TARGET}/etc/bashrc ${TARGET}/etc/bashrc
@@ -28,10 +27,14 @@ case $1 in
install -m 0644 ${TARGET}/usr/share/snap-base/snap.conf \ install -m 0644 ${TARGET}/usr/share/snap-base/snap.conf \
${TARGET}/etc/snap.conf ${TARGET}/etc/snap.conf
fi fi
if [ ! -f ${TARGET}/etc/snap_version ]; then if [ ! -f ${TARGET}/var/log/btmp ]; then
install -m 0644 ${TARGET}/usr/share/snap-base/snap_version \ install -v -m 600 /dev/null ${TARGET}/var/log/btmp
${TARGET}/etc/snap_version
fi fi
if [ ! -f ${TARGET}/var/log/lastlog ]; then
install -v -m 664 /dev/null ${TARGET}/var/log/lastlog
fi
if [ ! -f ${TARGET}/var/log/wtmp ]; then
install -v -m 664 /dev/null ${TARGET}/var/log/wtmp
fi fi
;; ;;
prerm) prerm)

View File

@@ -1,14 +1,32 @@
install: base usr var lib snap install: base usr etc var lib snap
base: base:
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc} && \ $(DESTDIR)/{bin,boot,dev,etc,home,lib,media,mnt,opt,proc} && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/{run,sbin,srv,usr,var} && \ $(DESTDIR)/{run,sbin,srv,sys,usr,var} && \
install -v -d -m 0750 -o root -g root \ install -v -d -m 0750 -o root -g root \
$(DESTDIR)/root && \ $(DESTDIR)/root && \
install -v -d -m 1777 $(DESTDIR)/tmp $(DESTDIR)/var/tmp install -v -d -m 1777 $(DESTDIR)/tmp $(DESTDIR)/var/tmp
etc: base
@ 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 usr: base
@install -v -d -m 0755 -o root -g root \ @install -v -d -m 0755 -o root -g root \
$(DESTDIR)/usr/{,local/}{bin,include,lib,sbin,src} && \ $(DESTDIR)/usr/{,local/}{bin,include,lib,sbin,src} && \
@@ -24,14 +42,6 @@ var: base
$(DESTDIR)/var/{log,mail,spool} && \ $(DESTDIR)/var/{log,mail,spool} && \
install -v -d -m 0755 -o root -g root \ install -v -d -m 0755 -o root -g root \
$(DESTDIR)/var/{opt,cache,lib/{color,misc,locate},local} && \ $(DESTDIR)/var/{opt,cache,lib/{color,misc,locate},local} && \
ln -sv /run $(DESTDIR)/var/run && \ ln -sv ../run $(DESTDIR)/var/run && \
ln -sv /run/lock $(DESTDIR)/var/lock ln -sv ../run/lock $(DESTDIR)/var/lock
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 usr/share/snap-base/* $(DESTDIR)/usr/share/snap-base

2
SRC/snap-base/snap.conf Normal file
View File

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

View File

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