May 2012 - Arch-releng - lists.archlinux.org

[arch-releng] Use pandoc instead of make-doc.sh
by Dario Giovannetti 13 Jun '12

13 Jun '12

I would like to propose using pandoc ( http://johnmacfarlane.net/pandoc/ ) instead of the make-doc.sh script for converting the installation guide (Markdown syntax) to the document hosted in the wiki (MediaWiki syntax). I've tested it and the result looks pretty good, with only a few minor manual refinements required (which I volunteer to perform, if needed): instead of the current script, which practically produces an html document, we would get a correctly-formed, much neater MediaWiki document. This would greatly simplify further improvements in the wikification of the the guide, like the adaptation to ArchWiki's style standars. Thank you Dario

2 5

Re: [arch-releng] efiboot question
by Mr Green 28 May '12

28 May '12

I do not have make_boot_efi in my build script, better go looking for it for standard kernel build =-O MrG

1 0

[arch-releng] mkarchiso & mkinitcpio problems
by Mr Green 28 May '12

28 May '12

Hi, I have fixed the problems I had with my build script, I needed to run mkinitcpio under mkarchiso -r <command> run [as per wiki]. Other errors were down to me :) Managed to get linux-lts kernel working live, but loading base packages less linux then installing linux-lts did not work as then it broke with errors of can not find /dev. So I loaded up both kernels then simply removed linux [kernel] after additional packages were loaded and of course made changes to mkinitcpio. Will make the changes for efiboot in next few days. Now waiting for systemd changes to hit the repos Thanks again for your help and patience MrG

1 0

[arch-releng] mkarchiso arch wiki guide
by Mr Green 25 May '12

25 May '12

After having problems with getting my build script running I thought I would test out Arch Linux Archiso guide. Think this is wrong # cp /lib/initcpio/hooks/archiso work/root-image/lib/initcpio/hooks # cp /lib/initcpio/install/archiso work/root-image/lib/initcpio/install Should be /usr/lib Set up directory and then run mkarchiso -r "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/vmlinuz-linux -g /boot/i686/archiso.img" run Got this error ==> ERROR: Unable to write to path: `/boot/i686/archiso.img' Not sure what is wrong, am fully up to date... not sure if archiso has had any changes in the last few days? MrG

2 1

[arch-releng] Mkinitcpio changes
by Mr Green 25 May '12

25 May '12

Seems with changes to mkinitcpio we no longer have a -b option [basedir], not sure why its removed Kinda breaks archiso at the moment. Unless you guys have caught it already :) MrG

3 2

Re: [arch-releng] mkinitcpio
by Mr Green 25 May '12

25 May '12

I have done some reading up and made changes to my build.sh to follow arch wiki guide So I now use mkarchiso -r "mkinitcpio -c ${script_path}/mkinitcpio.conf -k /boot/vmlinuz-linux-lts -g ${_dst_boot}/${arch}/archiso.img" run Which is the correct way :) I only noticed --basedir stuff today when I updated mkinitcpio /me slaps wrist.... MrG

2 1

[arch-releng] efiboot question
by Mr Green 25 May '12

25 May '12

Hi, Need a way to disable efiboot.img generation. Am assuming its something to do with build.sh. Is it possible? or where can I find out more information? MrG

2 1

[arch-releng] [PATCH 1/3] Use devtmpfs for /dev on the target
by Thomas Hebb 21 May '12

21 May '12

Switch from using a bind mount to devtmpfs when mounting /dev on the target system. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-blockdevices-filesystems.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 4312143..70805c8 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -112,9 +112,9 @@ target_special_fs () ! [ -d $var_TARGET_DIR/sys ] && mkdir $var_TARGET_DIR/sys ! [ -d $var_TARGET_DIR/dev ] && mkdir $var_TARGET_DIR/dev #mount, if not mounted yet - mount | grep -q "$var_TARGET_DIR/proc" || mount -t proc proc $var_TARGET_DIR/proc || die_error "Could not mount $var_TARGET_DIR/proc" - mount | grep -q "$var_TARGET_DIR/sys" || mount -t sysfs sysfs $var_TARGET_DIR/sys || die_error "Could not mount $var_TARGET_DIR/sys" - mount | grep -q "$var_TARGET_DIR/dev" || mount -o bind /dev $var_TARGET_DIR/dev || die_error "Could not mount $var_TARGET_DIR/dev" + mount | grep -q "$var_TARGET_DIR/proc" || mount -t proc proc $var_TARGET_DIR/proc || die_error "Could not mount $var_TARGET_DIR/proc" + mount | grep -q "$var_TARGET_DIR/sys" || mount -t sysfs sysfs $var_TARGET_DIR/sys || die_error "Could not mount $var_TARGET_DIR/sys" + mount | grep -q "$var_TARGET_DIR/dev" || mount -t devtmpfs devtmpfs $var_TARGET_DIR/dev || die_error "Could not mount $var_TARGET_DIR/dev" elif [ "$1" = off ] then umount $var_TARGET_DIR/proc || die_error "Could not umount $var_TARGET_DIR/proc" -- 1.7.10.2

2 2

[arch-releng] [PATCH 3/3] Fix a typo in bootloader debug message
by Thomas Hebb 21 May '12

21 May '12

Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-ui-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index a9362a2..bafaafb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -1077,7 +1077,7 @@ generate_grub_menulst() { debug FS "onraid with sep boot grubdev: $grubdev" else grubdev=$(mapdev $bootdev) - debug FS "onraid with sep boot grubdev: $grubdev" + debug FS "sep boot grubdev: $grubdev" fi fi -- 1.7.10.2

1 0

[arch-releng] [PATCH 2/3] Mount special filesystems during grub actions
by Thomas Hebb 21 May '12

21 May '12

Break grub actions on the target system out into separate functions in lib-software.sh and make sure we mount special filesystems (FS#29928). Also fix a pathname bug causing grub errors to go undetected. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- src/core/libs/lib-blockdevices-filesystems.sh | 12 ----------- src/core/libs/lib-software.sh | 27 +++++++++++++++++++++++++ src/core/libs/lib-ui-interactive.sh | 14 +++++-------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/src/core/libs/lib-blockdevices-filesystems.sh b/src/core/libs/lib-blockdevices-filesystems.sh index 70805c8..1d101c5 100644 --- a/src/core/libs/lib-blockdevices-filesystems.sh +++ b/src/core/libs/lib-blockdevices-filesystems.sh @@ -346,18 +346,6 @@ dev_is_in_softraid_or_lvmpv () { grep -qsw "${dev##*/}" /proc/mdstat || { pvscan -s 2>/dev/null | grep -q "$dev"; } } - -# generate the grub device map, which is a translation table between grub devicenames and linux devicenames -# hard disks get entries, but not their partitions -get_grub_map() { - inform "Generating GRUB device map...\nThis could take a while.\n\n Please be patient." - chroot $var_TARGET_DIR grub --no-floppy --device-map /boot/grub/device.map &>$TMP_GRUB_LOG <<EOF -quit -EOF - cp $var_TARGET_DIR/boot/grub/device.map $TMP_DEV_MAP -} - - # for given blockdevice, echo grub notation in this form: (hd0) or (hd0,0) (if it's a partition) # $1 : blockdevice # returns 0 on success. 1 otherwise. diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh index 942d312..909219e 100644 --- a/src/core/libs/lib-software.sh +++ b/src/core/libs/lib-software.sh @@ -120,3 +120,30 @@ target_configure_initcpio () { fi return $ret } + +# generate the grub device map, which is a translation table between grub devicenames and linux devicenames +# hard disks get entries, but not their partitions +target_grub_devicemap () { + inform "Generating GRUB device map...\nThis could take a while.\n\n Please be patient." + target_special_fs on + chroot $var_TARGET_DIR grub --no-floppy --device-map /boot/grub/device.map &>$TMP_GRUB_LOG <<EOF +quit +EOF + target_special_fs off + cp $var_TARGET_DIR/boot/grub/device.map $TMP_DEV_MAP +} + +# install grub +# $1: boot partition (grub notation) +# $2: device to install to (grub notation) +# $3: device to install to (linux notation) +target_grub_install () { + target_special_fs on + chroot $var_TARGET_DIR grub --no-floppy --batch &>$TMP_GRUB_LOG <<EOF +device $2 $3 +root $1 +setup $2 +quit +EOF + target_special_fs off +} diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 36483c1..a9362a2 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -897,7 +897,7 @@ interactive_install_bootloader () { } interactive_grub() { - get_grub_map + target_grub_devicemap [ ! -f $grubmenu ] && show_warning "No grub?" "Error: Couldn't find $grubmenu. Is GRUB installed?" && return 1 debug FS "starting interactive_grub" @@ -1139,14 +1139,10 @@ interactive_grub_install () { debug FS "bootdev: $bootdev" debug FS "boothd: $boothd" - chroot $var_TARGET_DIR grub --no-floppy --batch &>$TMP_GRUB_LOG <<EOF -device $bootdev $boothd -root $bootpart -setup $bootdev -quit -EOF - cat $var_TARGET_DIR/$TMP_GRUB_LOG >$LOG - if grep -q "Error [0-9]*: " $var_TARGET_DIR/$TMP_GRUB_LOG; then + target_grub_install "$bootpart" "$bootdev" "$boothd" + + cat $TMP_GRUB_LOG >$LOG + if grep -q "Error [0-9]*: " $TMP_GRUB_LOG; then notify "Error installing GRUB. (see $LOG for output)" return 1 fi -- 1.7.10.2

1 0