Changeset 731


Ignore:
Timestamp:
Nov 21, 2007 10:36:41 PM (6 years ago)
Author:
jrollins
Message:

debirf: more tweaking to try to get the non-root-required system to
work. BIG SNAG, though, that the device tree is not created currently
in this method, so debirf won't boot.

Location:
trunk/debirf
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/debirf/debian/changelog

    r725 r731  
    77  * /var/lib/debirf no longer included.  default buildd is ~/.debirf 
    88  * removed /etc/debirf in favor of doc/example-profiles 
     9  * various other tweaks and fixes and streamlines 
     10  * NOT WORKING BECAUSE OF NO DEVICE TREE IN ROOT 
    911 
    10  -- Jameson Rollins <jrollins@fifthhorseman.net>  Wed, 21 Nov 2007 15:11:46 -0500 
     12 -- Jameson Rollins <jrollins@fifthhorseman.net>  Wed, 21 Nov 2007 22:33:42 -0500 
    1113 
    1214debirf (0.5) unstable; urgency=low 

  • trunk/debirf/fs/usr/bin/make-debirf

    r725 r731  
    3939    # exclude aptitude 
    4040    mkdir -p "$DEBIRF_ROOT" 
    41     fakeroot -s "$DEBIRF_FAKECHROOT_STATE" fakechroot debootstrap --variant=fakechroot "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR" 
     41    fakeroot -s "$DEBIRF_FAKEROOT_STATE" fakechroot /usr/sbin/debootstrap --variant=fakechroot "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR" 
    4242} 
    4343 
    … …  
    4747        export $var 
    4848    done 
    49     fakeroot -i "$DEBIRF_FAKECHROOT_STATE" -s "$DEBIRF_FAKECHROOT_STATE" run-parts --verbose "$DEBIRF_PLUGINS" 
     49    fakeroot -i "$DEBIRF_FAKEROOT_STATE" -s "$DEBIRF_FAKEROOT_STATE" run-parts --verbose "$DEBIRF_PLUGINS" 
    5050} 
    5151 
    … …  
    5858     
    5959    # create root image 
    60     ( cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) > "$1" 
     60    ( cd "$DEBIRF_ROOT" && find * | fakeroot cpio -H newc --create  | gzip ) > "$1" 
    6161} 
    6262 
    … …  
    186186 
    187187# set fakechroot save file 
    188 DEBIRF_FAKECHROOT_STATE="$DEBIRF_BUILDD/.fakechroot-$DEBIRF_LABEL.save" 
     188DEBIRF_FAKEROOT_STATE="$DEBIRF_BUILDD/.fakechroot-$DEBIRF_LABEL.save" 
    189189 
    190190# check variables 
    … …  
    235235fi 
    236236 
    237 # clear mtab 
    238 > "$DEBIRF_ROOT/etc/mtab" 
    239 # add proc to fstab 
    240 if ! awk '{ print $2 }' < "$DEBIRF_ROOT/etc/fstab" | grep -q '^/proc' ; then 
    241     echo proc /proc proc defaults 0 0 >> "$DEBIRF_ROOT/etc/fstab" 
    242 fi 
    243  
    244237KERNAVAIL=$(ls -1 "$DEBIRF_ROOT/lib/modules" | head -n1) 
    245238DEBIRF_INITRD="${DEBIRF_LABEL}_${DEBIRF_DISTRO}_${KERNAVAIL}.cgz" 

  • trunk/debirf/fs/usr/share/debirf/common

    r721 r731  
    4343# execute command in debirf system using chroot 
    4444debirf_exec() { 
    45     fakechroot chroot "$DEBIRF_ROOT" $@ 
     45    fakechroot /usr/sbin/chroot "$DEBIRF_ROOT" "$@" 
    4646} 
    4747export -f debirf_exec 

  • trunk/debirf/fs/usr/share/debirf/plugins/a0_prep-root

    r725 r731  
    2323# write /etc/hosts 
    2424cat > "${DEBIRF_ROOT}/etc/hosts" <<EOF 
    25 127.0.0.1       localhost $DEBIRF_LABEL 
     25127.0.0.1       localhost 
     26127.0.1.1       $DEBIRF_LABEL 
    2627 
    2728# The following lines are desirable for IPv6 capable hosts 
    … …  
    3435EOF 
    3536 
     37# add proc to fstab 
     38#if ! awk '{ print $2 }' < "$DEBIRF_ROOT/etc/fstab" | grep -q '^/proc' ; then 
     39#    echo proc /proc proc defaults 0 0 >> "$DEBIRF_ROOT/etc/fstab" 
     40#fi 
     41echo proc /proc proc defaults 0 0 > "${DEBIRF_ROOT}/etc/fstab" 
     42 
    3643# update apt 
    3744debirf_exec apt-get update 

  • trunk/debirf/fs/usr/share/debirf/plugins/z1_clean-root

    r724 r731  
    11#!/bin/sh 
    22 
    3 # debirf plugin: apt-clean 
    4 # remove cached apt information not needed in the initramfs 
     3# debirf plugin: clean-root 
     4# clean up debirf root 
    55# 
    66# The debirf scripts were written by 
    … …  
    1212# or later. 
    1313 
     14# purge unneeded packages 
    1415debirf_exec apt-get --assume-yes remove --purge aptitude 
    1516 
     17# remove all cached apt information 
    1618debirf_exec apt-get clean 
    1719rm "$DEBIRF_ROOT/var/cache/apt/"*.bin 
    1820rm -rf "$DEBIRF_ROOT/var/lib/apt/lists/"* 
    1921mkdir "$DEBIRF_ROOT/var/lib/apt/lists/partial" 
     22 
     23# remake proc and dev directories 
     24# (originally made as symlinks by debootstrap with fakechroot) 
     25#rm -rf "$DEBIRF_ROOT/dev" 
     26#mkdir "$DEBIRF_ROOT/dev" 
     27rm -rf "$DEBIRF_ROOT/proc" 
     28mkdir "$DEBIRF_ROOT/proc" 
     29 
     30# clear mtab 
     31> "$DEBIRF_ROOT/etc/mtab" 
Note: See TracChangeset for help on using the changeset viewer.