summaryrefslogtreecommitdiff
path: root/virtual
diff options
context:
space:
mode:
authorrandomdan <randomdan@localhost>2010-04-28 17:31:07 +0000
committerrandomdan <randomdan@localhost>2010-04-28 17:31:07 +0000
commit1704f5d6c0584dc6fcdca1da6161de511f04c3bc (patch)
treeb9d4eb116633c4b5c17eae1e076b7281b9581b02 /virtual
parentAdd support for sdb,sdc,sdd in lvmroot (diff)
downloadportage-1704f5d6c0584dc6fcdca1da6161de511f04c3bc.tar.bz2
portage-1704f5d6c0584dc6fcdca1da6161de511f04c3bc.tar.xz
portage-1704f5d6c0584dc6fcdca1da6161de511f04c3bc.zip
Support tuxonice resume and use fbres to build right images in
Diffstat (limited to 'virtual')
-rwxr-xr-xvirtual/miller-base/files/lvmroot/init6
-rw-r--r--virtual/miller-base/files/lvmroot/initrd.list2
-rw-r--r--virtual/miller-base/files/lvmroot/makefile2
-rw-r--r--virtual/miller-base/miller-base-8-r3.ebuild (renamed from virtual/miller-base/miller-base-8-r2.ebuild)0
4 files changed, 5 insertions, 5 deletions
diff --git a/virtual/miller-base/files/lvmroot/init b/virtual/miller-base/files/lvmroot/init
index e1036e9..6921b5e 100755
--- a/virtual/miller-base/files/lvmroot/init
+++ b/virtual/miller-base/files/lvmroot/init
@@ -1,19 +1,19 @@
#!/bin/sh
mount -n -t proc proc /proc
-mount -n -t sysfs sysfs /sysfs
+mount -n -t sysfs sysfs /sys
mount -n -t tmpfs tmpfs /dev/mapper
mount -n -t tmpfs tmpfs /dev/data
CMDLINE=`cat /proc/cmdline`
vgchange -ay
-
+echo > /sys/power/tuxonice/do_resume
mount -n -r -t ext4 /dev/mapper/data-root /newroot || lvm
cd /newroot
umount /dev/mapper
umount /dev/data
-umount /sysfs
+umount /sys
umount /proc
exec chroot . /bin/sh -c "exec /sbin/init ${CMDLIND}" <dev/console >dev/console 2>&1
diff --git a/virtual/miller-base/files/lvmroot/initrd.list b/virtual/miller-base/files/lvmroot/initrd.list
index a8a1741..3a2b512 100644
--- a/virtual/miller-base/files/lvmroot/initrd.list
+++ b/virtual/miller-base/files/lvmroot/initrd.list
@@ -11,7 +11,7 @@ dir etc/lvm/backup 0755 0 0
dir proc 0755 0 0
dir newroot 0755 0 0
dir lib 0755 0 0
-dir sysfs 0755 0 0
+dir sys 0755 0 0
dir sbin 0755 0 0
nod dev/hda 0600 0 0 b 3 0
nod dev/hda1 0600 0 0 b 3 1
diff --git a/virtual/miller-base/files/lvmroot/makefile b/virtual/miller-base/files/lvmroot/makefile
index 8ea7d2c..9abdcc3 100644
--- a/virtual/miller-base/files/lvmroot/makefile
+++ b/virtual/miller-base/files/lvmroot/makefile
@@ -3,7 +3,7 @@ initrd.cpio.lzma : initrd.cpio.gz makefile init
initrd.cpio.gz : initrd.list makefile init /usr/src/linux/usr/gen_init_cpio
/usr/src/linux/usr/gen_init_cpio $< > $@
- /usr/sbin/splash_geninitramfs -a $@ -r 1280x1024 livecd-2007.0 --no8bpp
+ /usr/sbin/splash_geninitramfs -a $@ -r `fbres` livecd-2007.0 --no8bpp
initrd.deps.mk : initrd.list makefile /usr/src/linux/usr/gen_init_cpio
echo -n 'initrd.cpio.gz : ' > $@
diff --git a/virtual/miller-base/miller-base-8-r2.ebuild b/virtual/miller-base/miller-base-8-r3.ebuild
index 2483382..2483382 100644
--- a/virtual/miller-base/miller-base-8-r2.ebuild
+++ b/virtual/miller-base/miller-base-8-r3.ebuild