Skip to content

Commit

Permalink
use the same /etc/{group,passwd,shadow} as before for all builds exce…
Browse files Browse the repository at this point in the history
…pt dpup
  • Loading branch information
dimkr committed Jan 22, 2022
1 parent 8a2d829 commit 6c5f14e
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 66 deletions.
7 changes: 6 additions & 1 deletion merge2out
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,16 @@ else
echo "BUILD_FROM_WOOF=\"No woof-CE-git info available\"" >> ${WOOF_OUT}/DISTRO_SPECS
fi

# make sure target has these...
(
# make sure target has these...
cp -afv woof-arch/${TARGETARCH}/build/support/debdb2pupdb ${WOOF_OUT}/rootfs-skeleton/usr/local/petget/ 2>&1
cp -afv woof-arch/${TARGETARCH}/build/support/find_cat ${WOOF_OUT}/rootfs-skeleton/usr/local/petget/ 2>&1
cp -afv woof-arch/${TARGETARCH}/target/rootfs-skeleton/usr/sbin/pngoverlay-cairo ${WOOF_OUT}/support/ 2>&1

for CONFFILE in passwd shadow group; do
[ -f ${WOOF_OUT}/rootfs-skeleton/etc/${CONFFILE}.${COMPATDISTRO} ] && mv -vf ${WOOF_OUT}/rootfs-skeleton/etc/${CONFFILE}.${COMPATDISTRO} ${WOOF_OUT}/rootfs-skeleton/etc/${CONFFILE}
rm -f ${WOOF_OUT}/rootfs-skeleton/etc/${CONFFILE}.*
done
) | tee -a ${WOOF_OUT}/merge2out.log

echo
Expand Down
40 changes: 4 additions & 36 deletions woof-code/rootfs-skeleton/etc/group
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
root:x:0:
daemon:x:1:
tty:x:2:
ppp:x:200:
users:x:100:
users:x:500:
nobody:x:65534:
guest:x:501:
spot:x:502:spot
Expand All @@ -13,41 +14,9 @@ uucp::10:
lpadmin::112:root,spot,nobody,guest
netdev::113:
haldaemon::119:
sshd::32:sshd
sshd::33:sshd
webgroup:x:504:
disk:x:6:root,spot
sys:x:3:
adm:x:4:
tty:x:5:
lp:x:7:
mail:x:8:
news:x:9:
man:x:12:
proxy:x:13:
kmem:x:15:
dialout:x:20:
fax:x:21:
voice:x:22:
cdrom:x:24:
floppy:x:25:
tape:x:26:
sudo:x:27:
audio:x:29:
www-data:x:33:
backup:x:34:
operator:x:37:
list:x:38:
irc:x:39:
src:x:40:
gnats:x:41:
shadow:x:42:
utmp:x:43:
video:x:44:
sasl:x:45:
plugdev:x:46:
staff:x:50:
games:x:60:
disk::90:root,spot
disk::100:root,spot
audio::101:root,spot
lp::102:root,daemon,spot
dialout::103:root,spot
Expand All @@ -59,4 +28,3 @@ tape::108:root
tty::109:root,spot
plugdev::110:root,spot
bluetooth::111:root,spot
nogroup:x:65533:
62 changes: 62 additions & 0 deletions woof-code/rootfs-skeleton/etc/group.debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
root:x:0:
daemon:x:1:
ppp:x:200:
users:x:100:
nobody:x:65534:
guest:x:501:
spot:x:502:spot
bin::2:root,bin,daemon
messagebus:x:503:messagebus,root
ftp:x:1000:
dip:x:30:
uucp::10:
lpadmin::112:root,spot,nobody,guest
netdev::113:
haldaemon::119:
sshd::32:sshd
webgroup:x:504:
disk:x:6:root,spot
sys:x:3:
adm:x:4:
tty:x:5:
lp:x:7:
mail:x:8:
news:x:9:
man:x:12:
proxy:x:13:
kmem:x:15:
dialout:x:20:
fax:x:21:
voice:x:22:
cdrom:x:24:
floppy:x:25:
tape:x:26:
sudo:x:27:
audio:x:29:
www-data:x:33:
backup:x:34:
operator:x:37:
list:x:38:
irc:x:39:
src:x:40:
gnats:x:41:
shadow:x:42:
utmp:x:43:
video:x:44:
sasl:x:45:
plugdev:x:46:
staff:x:50:
games:x:60:
disk::90:root,spot
audio::101:root,spot
lp::102:root,daemon,spot
dialout::103:root,spot
kmem::104:root,spot
video::105:root,spot
floppy::106:root,spot
cdrom::107:root,spot
tape::108:root
tty::109:root,spot
plugdev::110:root,spot
bluetooth::111:root,spot
nogroup:x:65533:
17 changes: 2 additions & 15 deletions woof-code/rootfs-skeleton/etc/passwd
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,7 @@ bin:x:2:2:bin:/bin:
messagebus:x:503:503:Linux User,,,:/tmp:/bin/sh
ftp:x:1000:1000:Linux User,,,:/root/ftpd:/bin/sh
haldaemon:x:108:119:Hardware abstraction layer,,,:/var/run/hald:/bin/false
sys:x:3:3:sys:/dev:/usr/sbin/nologin
sync:x:4:65534:sync:/bin:/bin/sync
games:x:5:60:games:/usr/games:/usr/sbin/nologin
man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
irc:x:39:39:ircd:/run/ircd:/usr/sbin/nologin
gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
_apt:x:100:65534::/nonexistent:/usr/sbin/nologin
sshd:x:33:33:sshd:/:
webuser:x:1002:504:Linux User,,,:/root/Web-Server:/bin/sh
sshd:x:1003:1003:sshd:/:
man:x:65534:65534::/tmp:
25 changes: 25 additions & 0 deletions woof-code/rootfs-skeleton/etc/passwd.debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
root:x:0:0:root:/root:/bin/sh
daemon:x:1:1::/:
nobody:x:65534:65534::/tmp:
spot:x:502:502:Linux User,,,:/home/spot:/bin/sh
bin:x:2:2:bin:/bin:
messagebus:x:503:503:Linux User,,,:/tmp:/bin/sh
ftp:x:1000:1000:Linux User,,,:/root/ftpd:/bin/sh
haldaemon:x:108:119:Hardware abstraction layer,,,:/var/run/hald:/bin/false
sys:x:3:3:sys:/dev:/usr/sbin/nologin
sync:x:4:65534:sync:/bin:/bin/sync
games:x:5:60:games:/usr/games:/usr/sbin/nologin
man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
irc:x:39:39:ircd:/run/ircd:/usr/sbin/nologin
gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
_apt:x:100:65534::/nonexistent:/usr/sbin/nologin
webuser:x:1002:504:Linux User,,,:/root/Web-Server:/bin/sh
sshd:x:1003:1003:sshd:/:
14 changes: 0 additions & 14 deletions woof-code/rootfs-skeleton/etc/shadow
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,3 @@ haldaemon::0:99999:7:::
uucp::0:99999:7:::
sshd:*:9797:0:::::
webuser:!:14442:0:99999:7:::
sys:*:19008:0:99999:7:::
sync:*:19008:0:99999:7:::
games:*:19008:0:99999:7:::
man:*:19008:0:99999:7:::
lp:*:19008:0:99999:7:::
mail:*:19008:0:99999:7:::
news:*:19008:0:99999:7:::
proxy:*:19008:0:99999:7:::
www-data:*:19008:0:99999:7:::
backup:*:19008:0:99999:7:::
list:*:19008:0:99999:7:::
irc:*:19008:0:99999:7:::
gnats:*:19008:0:99999:7:::
_apt:*:19008:0:99999:7:::
25 changes: 25 additions & 0 deletions woof-code/rootfs-skeleton/etc/shadow.debian
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
root:$1$FD.MrIhr$BsfBOUpaBH4TPKcq0VcSk0:11329:0:99999:7:::
daemon:!:11141:0:99999:7:::
nobody:!:11141:0:99999:7:::
spot:!:12822:0:99999:7:::
bin:*:9797:0:::::
messagebus:!:0:99999:7:::
ftp:!:13885:0:99999:7:::
haldaemon::0:99999:7:::
uucp::0:99999:7:::
sshd:*:9797:0:::::
webuser:!:14442:0:99999:7:::
sys:*:19008:0:99999:7:::
sync:*:19008:0:99999:7:::
games:*:19008:0:99999:7:::
man:*:19008:0:99999:7:::
lp:*:19008:0:99999:7:::
mail:*:19008:0:99999:7:::
news:*:19008:0:99999:7:::
proxy:*:19008:0:99999:7:::
www-data:*:19008:0:99999:7:::
backup:*:19008:0:99999:7:::
list:*:19008:0:99999:7:::
irc:*:19008:0:99999:7:::
gnats:*:19008:0:99999:7:::
_apt:*:19008:0:99999:7:::

0 comments on commit 6c5f14e

Please sign in to comment.