Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (319b25d70e89f5b16bfb7cf3e73df18ccbf19945)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Karsten Behrmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (319b25d70e89f5b16bfb7cf3e73df18ccbf19945)
  • Date: Wed, 6 Feb 2008 04:41:08 -0600

GIT changes to master cauldron by Karsten Behrmann
<BearPerson AT sourcemage.org>:

base/boot/boot.bmp |binary
base/etc/fstab | 26 +++++++++++++++++++
base/etc/fstab.examples | 22 ++++++++++++++++
base/etc/group | 18 +++++++++++++
base/etc/issue | 2 +
base/etc/ld.so.conf | 2 +
base/etc/nsswitch.conf | 53
++++++++++++++++++++++++++++++++++++++++
base/etc/passwd | 4 +++
base/etc/shadow | 4 +++
base/etc/shells | 2 +
base/etc/sorcery/local/config | 3 ++
dev/null |binary
doc/creating-an-iso | 12 ++++++---
iso/boot/boot.bmp | 0
iso/etc/group | 18 -------------
iso/etc/issue | 2 -
iso/etc/ld.so.conf | 2 -
iso/etc/nsswitch.conf | 53
----------------------------------------
iso/etc/passwd | 4 ---
iso/etc/shadow | 4 ---
iso/etc/shells | 2 -
system/etc/fstab | 46 ----------------------------------
system/etc/fstab.examples | 22 ----------------
system/etc/sorcery/local/config | 3 --
24 files changed, 144 insertions(+), 160 deletions(-)

New commits:
commit 319b25d70e89f5b16bfb7cf3e73df18ccbf19945
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

note that /etc/shadow needs to be made read-only now that it's in base/

commit 2e939830dfa0d65b49c44ef27d496526c3b32291
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

move a bunch of files from iso/ to system/ to reduce duplication
rename system/ to base/ to reflect its new role as common ancestor

commit 437029e08da68c69469b174074f3424ac8b4f6b2
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

actually remove the examples from the master fstab

diff --git a/base/boot/boot.bmp b/base/boot/boot.bmp
new file mode 100644
index 0000000..60fcd08
Binary files /dev/null and b/base/boot/boot.bmp differ
diff --git a/base/etc/fstab b/base/etc/fstab
new file mode 100644
index 0000000..adfb773
--- /dev/null
+++ b/base/etc/fstab
@@ -0,0 +1,26 @@
+# /etc/fstab: static file system information.
+# <file system> <mount point> <type> <options> <dump> <pass>
+
+# Virtual, memory only, or non physical file systems
+proc /proc proc defaults 0 0
+devpts /dev/pts devpts defaults 0 0
+# only for 2.6 kernel
+sysfs /sys sysfs defaults 0 0
+
+# Add your file systems here.
+
+# Examples:
+#/dev/hda2 / reiserfs defaults,noatime 0 1
+#/dev/hda1 /boot ext2 defaults 0 2
+#/dev/hda3 swap swap defaults 0 0
+#
+# The schema is
+# <device> <mountpoint> <type> <options> <dump> <pass>
+# and is roughly executed as
+# mount -t <type> -o <options> <device> <mountpoint>
+
+# Note that, except for /, these need to be in "logical order" -
+# if you have both /usr and /usr/local, put /usr before /usr/local
+
+# For more information, see "man 5 fstab" from the man-pages spell.
+# also see fstab.examples for more examples from the smgl community.
diff --git a/base/etc/fstab.examples b/base/etc/fstab.examples
new file mode 100644
index 0000000..743d780
--- /dev/null
+++ b/base/etc/fstab.examples
@@ -0,0 +1,22 @@
+# ========== tmpfs ==========
+# If you want /tmp and pals stored in ram, use these lines.
+# Pro: always empty after reboot, should be fast
+# Con: always empty after reboot, uses memory/swap instead of disk space,
+# kernel should be smart enough to coche stuff anyway
+#
+#tmpfs /var/lock tmpfs defaults 0 0
+#tmpfs /var/run tmpfs defaults 0 0
+#tmpfs /tmp tmpfs defaults,size=256m,nr_inodes=64m 0 0
+
+# ========== shared memory ==========
+# enable this to get POSIX shared memory support (needed for a few apps)
+#tmpfs /dev/shm tmpfs defaults 0 0
+
+# ========== swap file ==========
+# Virtual memory swap file
+# Create with the following commands
+# dd if=/dev/zero of=/swapfile bs=1M count=1024
+# mkswap /swapfile
+# chmod 000 /swapfile
+# Then put the following in your /etc/fstab
+#/swapfile none swap defaults 0 0
diff --git a/base/etc/group b/base/etc/group
new file mode 100644
index 0000000..694548b
--- /dev/null
+++ b/base/etc/group
@@ -0,0 +1,18 @@
+root:x:0:
+daemon:x:1:
+bin:x:2:
+tty:x:5:
+disk:x:6:
+lp:x:7:
+mail:x:8:
+sys:x:11:
+kmem:x:15:
+ppp:x:20:
+scsi:x:23:
+cdrom:x:24:
+floppy:x:25:
+audio:x:29:
+video:x:44:
+wheel:x:55:
+users:x:1000:
+nogroup:x:65534:
diff --git a/base/etc/issue b/base/etc/issue
new file mode 100644
index 0000000..08fe105
--- /dev/null
+++ b/base/etc/issue
@@ -0,0 +1,2 @@
+Welcome to \l of \n on \d
+Running Source Mage GNU/\s, kernel \r on \m
diff --git a/base/etc/ld.so.conf b/base/etc/ld.so.conf
new file mode 100644
index 0000000..61b171c
--- /dev/null
+++ b/base/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/lib
+/usr/lib
diff --git a/base/etc/nsswitch.conf b/base/etc/nsswitch.conf
new file mode 100644
index 0000000..e9072a0
--- /dev/null
+++ b/base/etc/nsswitch.conf
@@ -0,0 +1,53 @@
+#
+# /etc/nsswitch.conf
+#
+# An example Name Service Switch config file. This file should be
+# sorted with the most-used services at the beginning.
+#
+# The entry '[NOTFOUND=return]' means that the search for an
+# entry should stop if the search in the previous entry turned
+# up nothing. Note that if the search failed due to some other reason
+# (like no NIS server responding) then the search continues with the
+# next entry.
+#
+# Legal entries are:
+#
+# nisplus or nis+ Use NIS+ (NIS version 3)
+# nis or yp Use NIS (NIS version 2), also called YP
+# dns Use DNS (Domain Name Service)
+# files Use the local files
+# db Use the local database (.db) files
+# compat Use NIS on compat mode
+# [NOTFOUND=return] Stop searching if not found so far
+#
+
+# To use db, put the "db" in front of "files" for entries you want to be
+# looked up first in the databases
+#
+# Example:
+#passwd: db files nisplus nis
+#shadow: db files nisplus nis
+#group: db files nisplus nis
+
+passwd: files nisplus nis
+shadow: files nisplus nis
+group: files nisplus nis
+
+#hosts: db files nisplus nis dns
+hosts: files nisplus nis dns
+
+services: nisplus [NOTFOUND=return] files
+networks: nisplus [NOTFOUND=return] files
+protocols: nisplus [NOTFOUND=return] files
+rpc: nisplus [NOTFOUND=return] files
+ethers: nisplus [NOTFOUND=return] files
+netmasks: nisplus [NOTFOUND=return] files
+bootparams: nisplus [NOTFOUND=return] files
+
+netgroup: nisplus
+
+publickey: nisplus
+
+automount: files nisplus
+aliases: files nisplus
+
diff --git a/base/etc/passwd b/base/etc/passwd
new file mode 100644
index 0000000..d9ddd3e
--- /dev/null
+++ b/base/etc/passwd
@@ -0,0 +1,4 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1::/dev/null:/bin/false
+bin:x:2:2::/dev/null:/bin/false
+nobody:x:65534:65534::/dev/null:/bin/false
diff --git a/base/etc/shadow b/base/etc/shadow
new file mode 100644
index 0000000..59a7a73
--- /dev/null
+++ b/base/etc/shadow
@@ -0,0 +1,4 @@
+root::12215:0:99999:7:::
+daemon:!:12793:0:99999:7:::
+bin:!:12793:0:99999:7:::
+nobody:!:12793:0:99999:7:::
diff --git a/base/etc/shells b/base/etc/shells
new file mode 100644
index 0000000..de0249b
--- /dev/null
+++ b/base/etc/shells
@@ -0,0 +1,2 @@
+/bin/sh
+/bin/bash
diff --git a/base/etc/sorcery/local/config b/base/etc/sorcery/local/config
new file mode 100755
index 0000000..6abc964
--- /dev/null
+++ b/base/etc/sorcery/local/config
@@ -0,0 +1,3 @@
+ GPG_VERIFY_SORCERY="on"
+ GPG_VERIFY_GRIMOIRE="on"
+ ARCHITECTURE="i486"
diff --git a/doc/creating-an-iso b/doc/creating-an-iso
index 28294a9..2981aeb 100644
--- a/doc/creating-an-iso
+++ b/doc/creating-an-iso
@@ -14,13 +14,17 @@ These should be extended.
* rm /var/cache/sorcery/*
* rm /usr/src/linux* -rf

-4. copy the chroot (one copy for the iso, one the system the user will
install) (call second chroot system-chroot)
+4. copy the contents of the "base" dir into the chroot
+ (this dir contains stuff like etc/shadow, make sure those files actually
+ end up as /etc/shadow in your chroot, and not as /base/etc/shadow)
+
+5. copy the chroot (one copy for the iso, one the system the user will
install) (call second chroot system-chroot)
* umount dev/pts dev proc

-5. copy the contents of the "iso" dir into iso-chroot
+5a. copy the contents of the "iso" dir into the iso-chroot

-6. copy the contents of the "system" dir into system-chroot
- * sanitize sorcery - set prompt delay, and others to default
+6. sanitize system chroot - set sorcery configs to mostly-default (read:
empty)
+ - chmod 0600 system-chroot/etc/shadow

7. tar up system-chroot and copy it into iso-chroot

diff --git a/iso/boot/boot.bmp b/iso/boot/boot.bmp
deleted file mode 100644
index 60fcd08..0000000
Binary files a/iso/boot/boot.bmp and /dev/null differ
diff --git a/iso/etc/group b/iso/etc/group
deleted file mode 100644
index 694548b..0000000
--- a/iso/etc/group
+++ /dev/null
@@ -1,18 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-sys:x:11:
-kmem:x:15:
-ppp:x:20:
-scsi:x:23:
-cdrom:x:24:
-floppy:x:25:
-audio:x:29:
-video:x:44:
-wheel:x:55:
-users:x:1000:
-nogroup:x:65534:
diff --git a/iso/etc/issue b/iso/etc/issue
deleted file mode 100644
index 08fe105..0000000
--- a/iso/etc/issue
+++ /dev/null
@@ -1,2 +0,0 @@
-Welcome to \l of \n on \d
-Running Source Mage GNU/\s, kernel \r on \m
diff --git a/iso/etc/ld.so.conf b/iso/etc/ld.so.conf
deleted file mode 100644
index 61b171c..0000000
--- a/iso/etc/ld.so.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/lib
-/usr/lib
diff --git a/iso/etc/nsswitch.conf b/iso/etc/nsswitch.conf
deleted file mode 100644
index e9072a0..0000000
--- a/iso/etc/nsswitch.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# /etc/nsswitch.conf
-#
-# An example Name Service Switch config file. This file should be
-# sorted with the most-used services at the beginning.
-#
-# The entry '[NOTFOUND=return]' means that the search for an
-# entry should stop if the search in the previous entry turned
-# up nothing. Note that if the search failed due to some other reason
-# (like no NIS server responding) then the search continues with the
-# next entry.
-#
-# Legal entries are:
-#
-# nisplus or nis+ Use NIS+ (NIS version 3)
-# nis or yp Use NIS (NIS version 2), also called YP
-# dns Use DNS (Domain Name Service)
-# files Use the local files
-# db Use the local database (.db) files
-# compat Use NIS on compat mode
-# [NOTFOUND=return] Stop searching if not found so far
-#
-
-# To use db, put the "db" in front of "files" for entries you want to be
-# looked up first in the databases
-#
-# Example:
-#passwd: db files nisplus nis
-#shadow: db files nisplus nis
-#group: db files nisplus nis
-
-passwd: files nisplus nis
-shadow: files nisplus nis
-group: files nisplus nis
-
-#hosts: db files nisplus nis dns
-hosts: files nisplus nis dns
-
-services: nisplus [NOTFOUND=return] files
-networks: nisplus [NOTFOUND=return] files
-protocols: nisplus [NOTFOUND=return] files
-rpc: nisplus [NOTFOUND=return] files
-ethers: nisplus [NOTFOUND=return] files
-netmasks: nisplus [NOTFOUND=return] files
-bootparams: nisplus [NOTFOUND=return] files
-
-netgroup: nisplus
-
-publickey: nisplus
-
-automount: files nisplus
-aliases: files nisplus
-
diff --git a/iso/etc/passwd b/iso/etc/passwd
deleted file mode 100644
index d9ddd3e..0000000
--- a/iso/etc/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1::/dev/null:/bin/false
-bin:x:2:2::/dev/null:/bin/false
-nobody:x:65534:65534::/dev/null:/bin/false
diff --git a/iso/etc/shadow b/iso/etc/shadow
deleted file mode 100644
index 59a7a73..0000000
--- a/iso/etc/shadow
+++ /dev/null
@@ -1,4 +0,0 @@
-root::12215:0:99999:7:::
-daemon:!:12793:0:99999:7:::
-bin:!:12793:0:99999:7:::
-nobody:!:12793:0:99999:7:::
diff --git a/iso/etc/shells b/iso/etc/shells
deleted file mode 100644
index de0249b..0000000
--- a/iso/etc/shells
+++ /dev/null
@@ -1,2 +0,0 @@
-/bin/sh
-/bin/bash
diff --git a/system/etc/fstab b/system/etc/fstab
deleted file mode 100644
index 61d3a5c..0000000
--- a/system/etc/fstab
+++ /dev/null
@@ -1,46 +0,0 @@
-# /etc/fstab: static file system information.
-# <file system> <mount point> <type> <options> <dump> <pass>
-
-# Virtual, memory only, or non physical file systems
-proc /proc proc defaults 0 0
-devpts /dev/pts devpts defaults 0 0
-# only for 2.6 kernel
-sysfs /sys sysfs defaults 0 0
-
-# Add your file systems here.
-
-# Examples:
-#/dev/hda2 / reiserfs defaults,noatime 0 1
-#/dev/hda1 /boot ext2 defaults 0 2
-#/dev/hda3 swap swap defaults 0 0
-#
-# The schema is
-# <device> <mountpoint> <type> <options> <dump> <pass>
-# and is roughly executed as
-# mount -t <type> -o <options> <device> <mountpoint>
-
-# Note that, except for /, these need to be in "logical order" -
-# if you have both /usr and /usr/local, put /usr before /usr/local
-
-# For more information, see "man 5 fstab" from the man-pages spell.
-# also see fstab.examples for more examples from the smgl community.
-
-#
-# We do no longer use tmpfs since it wasted memory instead of disk space
-#
-#tmpfs /var/lock tmpfs defaults 0 0
-#tmpfs /var/run tmpfs defaults 0 0
-#tmpfs /tmp tmpfs defaults,size=256m,nr_inodes=64m 0 0
-
-# enable this to get POSIX shared memory support (needed for a few apps)
-#tmpfs /dev/shm tmpfs defaults 0 0
-
-# Virtual memory swap file
-# If you need it then create it with the following commands
-# dd if=/dev/zero of=/swapfile bs=1M count=1024
-# mkswap /swapfile
-# chmod 000 /swapfile
-# Then uncomment the line below.
-#/swapfile none swap defaults 0 0
-
-# Add your own file systems here
diff --git a/system/etc/fstab.examples b/system/etc/fstab.examples
deleted file mode 100644
index 743d780..0000000
--- a/system/etc/fstab.examples
+++ /dev/null
@@ -1,22 +0,0 @@
-# ========== tmpfs ==========
-# If you want /tmp and pals stored in ram, use these lines.
-# Pro: always empty after reboot, should be fast
-# Con: always empty after reboot, uses memory/swap instead of disk space,
-# kernel should be smart enough to coche stuff anyway
-#
-#tmpfs /var/lock tmpfs defaults 0 0
-#tmpfs /var/run tmpfs defaults 0 0
-#tmpfs /tmp tmpfs defaults,size=256m,nr_inodes=64m 0 0
-
-# ========== shared memory ==========
-# enable this to get POSIX shared memory support (needed for a few apps)
-#tmpfs /dev/shm tmpfs defaults 0 0
-
-# ========== swap file ==========
-# Virtual memory swap file
-# Create with the following commands
-# dd if=/dev/zero of=/swapfile bs=1M count=1024
-# mkswap /swapfile
-# chmod 000 /swapfile
-# Then put the following in your /etc/fstab
-#/swapfile none swap defaults 0 0
diff --git a/system/etc/sorcery/local/config b/system/etc/sorcery/local/config
deleted file mode 100755
index 6abc964..0000000
--- a/system/etc/sorcery/local/config
+++ /dev/null
@@ -1,3 +0,0 @@
- GPG_VERIFY_SORCERY="on"
- GPG_VERIFY_GRIMOIRE="on"
- ARCHITECTURE="i486"



  • [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (319b25d70e89f5b16bfb7cf3e73df18ccbf19945), Karsten Behrmann, 02/06/2008

Archive powered by MHonArc 2.6.24.

Top of Page