Author: justin
Date: 2005-10-03 23:32:45 -0600 (Mon, 03 Oct 2005)
New Revision: 845
Added:
branches/utf8-newmake/etc/group
branches/utf8-newmake/etc/passwd
Modified:
branches/utf8-newmake/Makefile
branches/utf8-newmake/packages/mutt/Makefile
branches/utf8-newmake/packages/nfs-utils/Makefile
branches/utf8-newmake/packages/openssh/Makefile
Log:
Merged r840, r841, r842 to utf8-newmake branch (removed useradd and groupadd
commands, use initial group and passwd file).
Modified: branches/utf8-newmake/Makefile
===================================================================
--- branches/utf8-newmake/Makefile 2005-10-04 05:27:27 UTC (rev 844)
+++ branches/utf8-newmake/Makefile 2005-10-04 05:32:45 UTC (rev 845)
@@ -299,22 +299,7 @@
@-$(WD)/bin/ln -s bash /bin/sh
createfiles:
- @echo "root:x:0:0:root:/root:/bin/bash" > /etc/passwd
- @echo "root:x:0:" > /etc/group
- @echo "bin:x:1:" >> /etc/group
- @echo "sys:x:2:" >> /etc/group
- @echo "kmem:x:3:" >> /etc/group
- @echo "tty:x:4:" >> /etc/group
- @echo "tape:x:5:" >> /etc/group
- @echo "daemon:x:6:" >> /etc/group
- @echo "floppy:x:7:" >> /etc/group
- @echo "disk:x:8:" >> /etc/group
- @echo "lp:x:9:" >> /etc/group
- @echo "dialout:x:10:" >> /etc/group
- @echo "audio:x:11:" >> /etc/group
- @echo "video:x:12:" >> /etc/group
- @echo "utmp:x:13:" >> /etc/group
- @echo "usb:x:14:" >> /etc/group
+ @install -m644 -oroot -groot $(WD)/etc/{group,passwd} /etc
@touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
@chgrp utmp /var/run/utmp /var/log/lastlog
@chmod 664 /var/run/utmp /var/log/lastlog
Added: branches/utf8-newmake/etc/group
===================================================================
--- branches/utf8-newmake/etc/group 2005-10-04 05:27:27 UTC (rev 844)
+++ branches/utf8-newmake/etc/group 2005-10-04 05:32:45 UTC (rev 845)
@@ -0,0 +1,17 @@
+root:x:0:
+bin:x:1:
+sys:x:2:
+kmem:x:3:
+tty:x:4:
+tape:x:5:
+daemon:x:6:
+floppy:x:7:
+disk:x:8:
+lp:x:9:
+dialout:x:10:
+audio:x:11:
+video:x:12:
+utmp:x:13:
+usb:x:14:
+mail:x:34:
+nogroup:x:99:
Added: branches/utf8-newmake/etc/passwd
===================================================================
--- branches/utf8-newmake/etc/passwd 2005-10-04 05:27:27 UTC (rev 844)
+++ branches/utf8-newmake/etc/passwd 2005-10-04 05:32:45 UTC (rev 845)
@@ -0,0 +1,3 @@
+root:x:0:0:root:/root:/bin/bash
+sshd:x:50:50:sshd:/var/lib/sshd:/bin/false
+nobody:x:99:99:nobody:/dev/null:/bin/false
Modified: branches/utf8-newmake/packages/mutt/Makefile
===================================================================
--- branches/utf8-newmake/packages/mutt/Makefile 2005-10-04 05:27:27 UTC
(rev 844)
+++ branches/utf8-newmake/packages/mutt/Makefile 2005-10-04 05:32:45 UTC
(rev 845)
@@ -26,7 +26,6 @@
$(std_build)
compile-stage2:
- groupadd mail
zcat ../$(PATCH1) | patch -Np1
patch -Np1 -i ../$(PATCH2)
./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
Modified: branches/utf8-newmake/packages/nfs-utils/Makefile
===================================================================
--- branches/utf8-newmake/packages/nfs-utils/Makefile 2005-10-04 05:27:27 UTC
(rev 844)
+++ branches/utf8-newmake/packages/nfs-utils/Makefile 2005-10-04 05:32:45 UTC
(rev 845)
@@ -24,8 +24,6 @@
$(std_build)
compile-stage2:
- groupadd -g 99 nogroup
- useradd -c "Unprivileged Nobody" -d /dev/null -g nogroup -s /bin/false
-u 99 nobody
patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 \
--disable-gss
Modified: branches/utf8-newmake/packages/openssh/Makefile
===================================================================
--- branches/utf8-newmake/packages/openssh/Makefile 2005-10-04 05:27:27 UTC
(rev 844)
+++ branches/utf8-newmake/packages/openssh/Makefile 2005-10-04 05:32:45 UTC
(rev 845)
@@ -22,13 +22,14 @@
compile-stage2:
install -v -d -m700 /var/lib/sshd
chown root:sys /var/lib/sshd
- groupadd sshd
- useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure
./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin \
--with-md5-passwords --with-privsep-path=/var/lib/sshd
make $(PM)
make install-nokeys
+ install -v -m755 -d /usr/share/doc/$(DIR)
+ install -v -m644 INSTALL LICENSE OVERVIEW README* WARNING.RNG \
+ /usr/share/doc/$(DIR)
clean:
-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
