From: martin langhoff <[EMAIL PROTECTED]> The user/group database files were clobbering the correct user/group files that belong to the LiveCD.
With this we also fix #6678 - the root password entered during install is preserved. --- fsroot.olpc.img/etc/group | 77 ------------------------------------------- fsroot.olpc.img/etc/gshadow | 77 ------------------------------------------- fsroot.olpc.img/etc/passwd | 64 ----------------------------------- fsroot.olpc.img/etc/shadow | 64 ----------------------------------- 4 files changed, 0 insertions(+), 282 deletions(-) delete mode 100644 fsroot.olpc.img/etc/group delete mode 100644 fsroot.olpc.img/etc/gshadow delete mode 100644 fsroot.olpc.img/etc/passwd delete mode 100644 fsroot.olpc.img/etc/shadow diff --git a/fsroot.olpc.img/etc/group b/fsroot.olpc.img/etc/group deleted file mode 100644 index 28a4638..0000000 --- a/fsroot.olpc.img/etc/group +++ /dev/null @@ -1,77 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin,adm -adm:x:4:root,adm,daemon -tty:x:5: -disk:x:6:root -lp:x:7:daemon,lp -mem:x:8: -kmem:x:9: -wheel:x:10:root -mail:x:12:mail,postfix -news:x:13:news -uucp:x:14:uucp -man:x:15: -games:x:20: -gopher:x:30: -dip:x:40: -ftp:x:50: -lock:x:54: -nobody:x:99: -users:x:100: -rpm:x:37: -dbus:x:81: -utmp:x:22: -utempter:x:35: -avahi:x:70: -mailnull:x:47: -smmsp:x:51: -nscd:x:28: -floppy:x:19: -vcsa:x:69: -haldaemon:x:68: -sshd:x:74: -netdump:x:34: -pcap:x:77: -slocate:x:21: -xfs:x:43: -beaglidx:x:58: -distcache:x:94: -ntp:x:38: -apache:x:48: -webalizer:x:67: -squid:x:23: -gdm:x:42: -wad:x:500: -holger:x:501: -martin:x:502: -munin:x:101: -screen:x:84: -named:x:25: -mysql:x:27: -tomcat:x:91: -erikb:x:503: -mikhak:x:504: -sj:x:505: -dcbw:x:506: -xoreg:x:507: -dwmw2:x:508: -radvd:x:75: -danjared:x:509: -openvpn:x:102: -tknudsen:x:510: -nelhage:x:511: -lighttpd:x:103: -SHF7200000B:x:512: -cananian:x:513: -dan_margo:x:514: -SHF71400131:x:515: -SHF71400132:x:516: -rpcuser:x:29: -nfsnobody:x:65534: -postdrop:x:90: -postfix:x:89: -wbpriv:x:88:squid -rpc:x:32: -tcpdump:x:72: diff --git a/fsroot.olpc.img/etc/gshadow b/fsroot.olpc.img/etc/gshadow deleted file mode 100644 index 9d67a8d..0000000 --- a/fsroot.olpc.img/etc/gshadow +++ /dev/null @@ -1,77 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin,adm -adm:::root,adm,daemon -tty::: -disk:::root -lp:::daemon,lp -mem::: -kmem::: -wheel:::root -mail:::mail,postfix -news:::news -uucp:::uucp -man::: -games::: -gopher::: -dip::: -ftp::: -lock::: -nobody::: -users::: -rpm:x:: -dbus:x:: -utmp:x:: -utempter:x:: -avahi:x:: -mailnull:x:: -smmsp:x:: -nscd:x:: -floppy:x:: -vcsa:x:: -haldaemon:x:: -sshd:x:: -netdump:x:: -pcap:x:: -slocate:x:: -xfs:x:: -beaglidx:x:: -distcache:x:: -ntp:x:: -apache:x:: -webalizer:x:: -squid:x:: -gdm:x:: -wad:!!:: -holger:!:: -martin:!:: -munin:!:: -screen:!:: -named:!:: -mysql:!:: -tomcat:!:: -erikb:!:: -mikhak:!:: -sj:!:: -dcbw:!:: -xoreg:!:: -dwmw2:!:: -radvd:!:: -danjared:!:: -openvpn:!:: -tknudsen:!:: -nelhage:!:: -lighttpd:!:: -SHF7200000B:!:: -cananian:!:: -dan_margo:!:: -SHF71400131:!:: -SHF71400132:!:: -rpcuser:!:: -nfsnobody:!:: -postdrop:!:: -postfix:!:: -wbpriv:!::squid -rpc:!:: -tcpdump:!:: diff --git a/fsroot.olpc.img/etc/passwd b/fsroot.olpc.img/etc/passwd deleted file mode 100644 index 663b8c1..0000000 --- a/fsroot.olpc.img/etc/passwd +++ /dev/null @@ -1,64 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/sbin/nologin -daemon:x:2:2:daemon:/sbin:/sbin/nologin -adm:x:3:4:adm:/var/adm:/sbin/nologin -lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin -sync:x:5:0:sync:/sbin:/bin/sync -shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown -halt:x:7:0:halt:/sbin:/sbin/halt -mail:x:8:12:mail:/var/spool/mail:/sbin/nologin -news:x:9:13:news:/etc/news: -uucp:x:10:14:uucp:/var/spool/uucp:/sbin/nologin -operator:x:11:0:operator:/root:/sbin/nologin -games:x:12:100:games:/usr/games:/sbin/nologin -gopher:x:13:30:gopher:/var/gopher:/sbin/nologin -ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin -nobody:x:99:99:Nobody:/:/sbin/nologin -rpm:x:37:37::/var/lib/rpm:/sbin/nologin -dbus:x:81:81:System message bus:/:/sbin/nologin -avahi:x:70:70:Avahi daemon:/:/sbin/nologin -mailnull:x:47:47::/var/spool/mqueue:/sbin/nologin -smmsp:x:51:51::/var/spool/mqueue:/sbin/nologin -nscd:x:28:28:NSCD Daemon:/:/sbin/nologin -vcsa:x:69:69:virtual console memory owner:/dev:/sbin/nologin -haldaemon:x:68:68:HAL daemon:/:/sbin/nologin -sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin -netdump:x:34:34:Network Crash Dump user:/var/crash:/bin/bash -pcap:x:77:77::/var/arpwatch:/sbin/nologin -xfs:x:43:43:X Font Server:/etc/X11/fs:/sbin/nologin -beaglidx:x:58:58:User for Beagle indexing:/var/cache/beagle:/sbin/nologin -distcache:x:94:94:Distcache:/:/sbin/nologin -ntp:x:38:38::/etc/ntp:/sbin/nologin -apache:x:48:48:Apache:/var/www:/sbin/nologin -webalizer:x:67:67:Webalizer:/var/www/usage:/sbin/nologin -squid:x:23:23::/var/spool/squid:/sbin/nologin -gdm:x:42:42::/var/gdm:/sbin/nologin -wad:x:500:500:John Watlington:/home/wad:/bin/bash -holger:x:501:501::/home/holger:/bin/bash -martin:x:502:502::/home/martin:/bin/bash -munin:x:100:101:Munin user:/var/lib/munin:/sbin/nologin -named:x:25:25:Named:/var/named:/sbin/nologin -mysql:x:27:27:MySQL Server:/var/lib/mysql:/bin/bash -tomcat:x:91:91:Tomcat:/usr/share/tomcat5:/bin/sh -erikb:x:503:503::/home/erikb:/bin/bash -mikhak:x:504:504::/home/mikhak:/bin/bash -sj:x:505:505::/home/sj:/bin/bash -dcbw:x:506:506::/home/dcbw:/bin/bash -xoreg:x:507:507::/home/xoreg:/bin/bash -dwmw2:x:508:508::/home/dwmw2:/bin/bash -radvd:x:75:75:radvd user:/:/sbin/nologin -danjared:x:509:509::/home/danjared:/bin/bash -openvpn:x:101:102:OpenVPN:/etc/openvpn:/sbin/nologin -tknudsen:x:510:510::/home/tknudsen:/bin/bash -nelhage:x:511:511::/home/nelhage:/bin/bash -lighttpd:x:102:103:lighttpd web server:/srv/www/lighttpd:/sbin/nologin -SHF7200000B:x:512:512:nelhage:/home/SHF7200000B:/bin/bash -cananian:x:513:513::/home/cananian:/bin/bash -dan_margo:x:514:514::/home/dan_margo:/bin/bash -SHF71400131:x:515:515::/home/SHF71400131:/bin/bash -SHF71400132:x:516:516:Test User:/home/SHF71400132:/bin/bash -rpcuser:x:29:29:RPC Service User:/var/lib/nfs:/sbin/nologin -nfsnobody:x:65534:65534:Anonymous NFS User:/var/lib/nfs:/sbin/nologin -postfix:x:89:89::/var/spool/postfix:/sbin/nologin -rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/sbin/nologin -tcpdump:x:72:72::/:/sbin/nologin diff --git a/fsroot.olpc.img/etc/shadow b/fsroot.olpc.img/etc/shadow deleted file mode 100644 index b974208..0000000 --- a/fsroot.olpc.img/etc/shadow +++ /dev/null @@ -1,64 +0,0 @@ -root:$1$t4rPtdon$/QTppfJdHbYS9RURxEV9t/:13592:0:99999:7::: -bin:*:13592:0:99999:7::: -daemon:*:13592:0:99999:7::: -adm:*:13592:0:99999:7::: -lp:*:13592:0:99999:7::: -sync:*:13592:0:99999:7::: -shutdown:*:13592:0:99999:7::: -halt:*:13592:0:99999:7::: -mail:*:13592:0:99999:7::: -news:*:13592:0:99999:7::: -uucp:*:13592:0:99999:7::: -operator:*:13592:0:99999:7::: -games:*:13592:0:99999:7::: -gopher:*:13592:0:99999:7::: -ftp:*:13592:0:99999:7::: -nobody:*:13592:0:99999:7::: -rpm:!!:13592:0:99999:7::: -dbus:!!:13592:0:99999:7::: -avahi:!!:13592:0:99999:7::: -mailnull:!!:13592:0:99999:7::: -smmsp:!!:13592:0:99999:7::: -nscd:!!:13592:0:99999:7::: -vcsa:!!:13592:0:99999:7::: -haldaemon:!!:13592:0:99999:7::: -sshd:!!:13592:0:99999:7::: -netdump:!!:13592:0:99999:7::: -pcap:!!:13592:0:99999:7::: -xfs:!!:13592:0:99999:7::: -beaglidx:!!:13592:0:99999:7::: -distcache:!!:13592:0:99999:7::: -ntp:!!:13592:0:99999:7::: -apache:!!:13592:0:99999:7::: -webalizer:!!:13592:0:99999:7::: -squid:!!:13592:0:99999:7::: -gdm:!!:13592:0:99999:7::: -wad:$1$h3o/5j4b$.Glf36uwqnlCy7VtDAh54/:13592:0:99999:7::: -holger:$1$XE9HJylb$4CnsVy8cyF6Mrk70tXsGL0:13593:0:99999:7::: -martin:$1$A/ObBROJ$Y1bquM0damCfz1bP5dXjg/:13594:0:99999:7::: -munin:!!:13596:::::: -named:!!:13598:::::: -mysql:!!:13598:::::: -tomcat:!!:13600:::::: -erikb:$1$wRJwWWKx$Paht4XJKGYgdAuMbyi4vX1:13600:0:99999:7::: -mikhak:$1$zUeA32FU$SniNI0eNIt28Pls6Mj0aJ/:13600:0:99999:7::: -sj:$1$6JrGAERT$RCUyLB/q1SNbTDAvgBcAB/:13600:0:99999:7::: -dcbw:$1$MSMQkYH/$nFYV5Au9YvvjuCbhjsltc/:13609:0:99999:7::: -xoreg:!!:13647:0:99999:7::: -dwmw2:$1$DPcH7TWv$gU4fYAyo3B94grAqNzFfP/:13654:0:99999:7::: -radvd:!!:13654:::::: -danjared:$1$qzU88vjo$AprMCDuPrtXfsm7D9n7dZ/:13672:0:99999:7::: -openvpn:!!:13672:::::: -tknudsen:!!:13672:0:99999:7::: -nelhage:$1$d2dkpYrA$IuBqgt6N/utWFSejQ0E990:13676:0:99999:7::: -lighttpd:!!:13676:::::: -SHF7200000B:$1$p36DG5De$s2dZiRMx35c8XDLqnazoi1:13679:0:99999:7::: -cananian:$1$FUFI8EeZ$NUzodQFPv6wtkO.XQDmii1:13686:0:99999:7::: -dan_margo:$1$84mWGd3y$BGRM8HgxANEoABYJlk4df.:13705:0:99999:7::: -SHF71400131:$1$yTyId4Os$S1G0svBCk2WfT1AqRzqpM/:13700:0:99999:7::: -SHF71400132:$1$RissSLZZ$XT2DHhMzXCx7qqeacJvW6.:13700:0:99999:7::: -rpcuser:!!:13711:::::: -nfsnobody:!!:13711:::::: -postfix:!!:13711:::::: -rpc:!!:13711:0:99999:7::: -tcpdump:!!:13711:::::: -- 1.5.4.34.g053d9 _______________________________________________ Server-devel mailing list [email protected] http://lists.laptop.org/listinfo/server-devel
