From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QShq8-0007zS-6V for garchives@archives.gentoo.org; Sat, 04 Jun 2011 03:47:56 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBCBA1C019; Sat, 4 Jun 2011 03:47:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A5E301C019 for ; Sat, 4 Jun 2011 03:47:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3CF91B402B for ; Sat, 4 Jun 2011 03:47:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 227B980506 for ; Sat, 4 Jun 2011 03:47:46 +0000 (UTC) From: "Liam McLoughlin" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Liam McLoughlin" Message-ID: Subject: [gentoo-commits] proj/gentoaster:master commit in: / X-VCS-Repository: proj/gentoaster X-VCS-Files: create_image.sh extlinux.conf fstab syslinux.conf X-VCS-Directories: / X-VCS-Committer: hexxeh X-VCS-Committer-Name: Liam McLoughlin X-VCS-Revision: d46419cab28b97d2a0fcba912c25c142c9d7d923 Date: Sat, 4 Jun 2011 03:47:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 78a3c5a062753f9dd098e0e14ebfc6a6 commit: d46419cab28b97d2a0fcba912c25c142c9d7d923 Author: Liam McLoughlin hexxeh net> AuthorDate: Sat Jun 4 03:47:29 2011 +0000 Commit: Liam McLoughlin hexxeh net> CommitDate: Sat Jun 4 03:47:29 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoaster.gi= t;a=3Dcommit;h=3Dd46419ca Adding fstab and renaming bootloader config --- create_image.sh | 13 ++++++++----- syslinux.conf =3D> extlinux.conf | 0 fstab | 27 +++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/create_image.sh b/create_image.sh index 12f93ee..e403df9 100755 --- a/create_image.sh +++ b/create_image.sh @@ -43,8 +43,8 @@ echo -e "\x55\xaa" | dd bs=3D1 count=3D2 seek=3D510 of=3D= ${IMAGE_NAME} conv=3Dnotrunc &>> LOOP_DEV_IMAGE=3D`losetup -f` losetup ${LOOP_DEV_IMAGE} ${IMAGE_NAME} &>> ${LOG_FILE} =20 -sfdisk ${LOOP_DEV_IMAGE} -D -uM &>> ${LOG_FILE} << EOF -,${BOOT_MEGABYTES},83,* +sfdisk ${LOOP_DEV_IMAGE} -uM &>> ${LOG_FILE} << EOF +1,${BOOT_MEGABYTES},83,* ,${SWAP_MEGABYTES},82,- ,,83,- EOF @@ -61,7 +61,7 @@ sleep 2 losetup -d ${LOOP_DEV_BOOT} =20 LOOP_DEV_ROOT=3D`losetup -f` -losetup -o $(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEGA= BYTES} * 1024 * 1024 ) )) ${LOOP_DEV_ROOT} ${IMAGE_NAME} +losetup -o $(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + ( ${SWAP_MEG= ABYTES} * 1024 * 1024 ) )) ${LOOP_DEV_ROOT} ${IMAGE_NAME} mkfs -t ext3 ${LOOP_DEV_ROOT} &>> ${LOG_FILE} #sleep 2 #losetup -d ${LOOP_DEV_ROOT} @@ -76,7 +76,7 @@ echo "Mounting fileystems" =20 echo "Mount root" mkdir -p rootfs -mount -o loop,offset=3D$(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + (= ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${IMAGE_NAME} rootfs +mount -o loop,offset=3D$(( 512 + ( ${BOOT_MEGABYTES} * 1024 * 1024 ) + = ( ${SWAP_MEGABYTES} * 1024 * 1024 ) )) ${IMAGE_NAME} rootfs echo "Mount boot" mkdir -p rootfs/boot mount -o loop,offset=3D512 ${IMAGE_NAME} rootfs/boot @@ -128,6 +128,9 @@ echo "Setting hostname to ${HOSTNAME}" linux32 chroot . /bin/bash -c "echo 127.0.0.1 ${HOSTNAME}.local ${HOSTNA= ME} localhost > /etc/hosts" &>> ${LOG_FILE} #linux32 chroot . hostname ${HOSTNAME} &>> ${LOG_FILE} =20 +echo "Copying new fstab" +cp ../fstab etc/fstab &>> ${LOG_FILE} + echo "Downloading/installing kernel sources" linux32 chroot . emerge gentoo-sources &>> ${LOG_FILE} =20 @@ -166,7 +169,7 @@ linux32 chroot . /bin/bash -c "echo '${DEFAULT_USERNA= ME}:${DEFAULT_PASSWORD}' | echo "Installing extlinux" extlinux --heads 255 --sectors 63 --install boot dd if=3D/usr/lib/extlinux/mbr.bin of=3D../${IMAGE_NAME} conv=3Dnotrunc - +cp ../extlinux.conf boot/ cd .. cleanup_mounts =20 diff --git a/syslinux.conf b/extlinux.conf similarity index 100% rename from syslinux.conf rename to extlinux.conf diff --git a/fstab b/fstab new file mode 100644 index 0000000..e67e4ec --- /dev/null +++ b/fstab @@ -0,0 +1,27 @@ +# /etc/fstab: static file system information. +# +# noatime turns off atimes for increased performance (atimes normally ar= en't=20 +# needed; notail increases performance of ReiserFS (at the expense of st= orage=20 +# efficiency). It's safe to drop the noatime options if you want and to= =20 +# switch between notail / tail freely. +# +# The root filesystem should have a pass number of either 0 or 1. +# All other filesystems should have a pass number of 0 or greater than 1= . +# +# See the manpage fstab(5) for more information. +# + +# + +# NOTE: If your BOOT partition is ReiserFS, add the notail option to opt= s. +/dev/sda1 /boot ext2 noauto,noatime 1 2 +/dev/sda3 / ext3 noatime 0 1 +/dev/sda2 none swap sw 0 0 +/dev/cdrom /mnt/cdrom auto noauto,ro 0 0 +#/dev/fd0 /mnt/floppy auto noauto 0 0 + +# glibc 2.2 and above expects tmpfs to be mounted at /dev/shm for=20 +# POSIX shared memory (shm_open, shm_unlink). +# (tmpfs is a dynamically expandable/shrinkable ramdisk, and will +# use almost no memory if not populated with files) +shm /dev/shm tmpfs nodev,nosuid,noexec 0 0