diff --git a/Makefile b/Makefile index a28c62a..ec86143 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ DESC = Base system directories and files ARCHIVE := SRCDIR := $(PWD)/SRC/snap-base PATCHDIR := $(PWD)/SRC/patches -VERSION := 0.0alpha1-3 +VERSION := 0.0alpha1-5 include /usr/share/snap/Makefile.snaplinux diff --git a/SNAP/ids.default b/SNAP/ids.default new file mode 100644 index 0000000..fde7bbc --- /dev/null +++ b/SNAP/ids.default @@ -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 diff --git a/SNAP/usher b/SNAP/usher index ed0c3dc..a1703b3 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e diff --git a/SRC/snap-base/Makefile b/SRC/snap-base/Makefile index afb01cc..38ec82c 100644 --- a/SRC/snap-base/Makefile +++ b/SRC/snap-base/Makefile @@ -10,7 +10,8 @@ base: 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 && \ @@ -41,6 +42,6 @@ var: base $(DESTDIR)/var/{log,mail,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 + ln -sv ../run $(DESTDIR)/var/run && \ + ln -sv ../run/lock $(DESTDIR)/var/lock