Changeset 1305


Ignore:
Timestamp:
Nov 29, 2009, 11:53:21 AM (9 years ago)
Author:
jrollins
Message:

debirf: undo last commit that was a dumb mistake

Location:
trunk/debirf
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/debirf/debian/changelog

    r1304 r1305  
    1 debirf (0.26-1) unstable; urgency=low
    2 
     1debirf (0.25-1) UNRELEASED; urgency=low
     2
     3  * use busybox cpio in nest now that's it's been fixed (closes CMRG: #54)
     4  * remove no longer needed install-udev module (udev installed by default)
    35  * improve grub menu configuration (Closes: #544409)
    46  * updated README, and makeiso checking (Closes: #554020)
    57  * redirect log out to stderr
    68
    7  -- Jameson Graef Rollins <jrollins@finestructure.net>  Sun, 29 Nov 2009 11:11:37 -0500
    8 
    9 debirf (0.25-1) unstable; urgency=low
    10 
    11   * use busybox cpio in nest now that's it's been fixed (closes CMRG: #54)
    12   * remove no longer needed install-udev module (udev installed by default)
    13 
    14  -- Jameson Graef Rollins <jrollins@finestructure.net>  Fri, 02 Oct 2009 22:14:50 +0200
     9 -- Jameson Graef Rollins <jrollins@finestructure.net>  Tue, 03 Nov 2009 15:31:53 -0500
    1510
    1611debirf (0.24-1) unstable; urgency=low
  • trunk/debirf/src/modules/a0_prep-root

    r1279 r1305  
    6464
    6565# update/upgrade
    66 debirf_exec apt-get update
    67 debirf_exec apt-get upgrade
     66debirf_exec apt-get --force-yes update
     67debirf_exec apt-get --force-yes upgrade
    6868
    6969# make sure aptitude is installed, since some modules require it
    70 debirf_exec apt-get -y install aptitude
     70#debirf_exec apt-get -y install aptitude
  • trunk/debirf/src/modules/install-kernel

    r1195 r1305  
    3737    # download only the desired kernel package directly into the apt
    3838    # cache for dpkg extraction
    39     debirf_exec sh -c "cd /var/cache/apt/archives/ && aptitude download \"$KNAME\""
     39    #debirf_exec sh -c "cd /var/cache/apt/archives/ && aptitude download \"$KNAME\""
     40    debirf_exec sh -c "cd /var/cache/apt/archives/ && apt-get --download-only install \"$KNAME\""
    4041
    4142else
  • trunk/debirf/src/modules/xkiosk

    r1195 r1305  
    1616### download needed packages
    1717# could maybe pick and choose xorg packages if hardware known
    18 debirf_exec apt-get install --assume-yes xorg matchbox-window-manager iceweasel
     18#debirf_exec apt-get install --assume-yes --no-install-recommends xorg matchbox-window-manager iceweasel
     19debirf_exec apt-get install --assume-yes --no-install-recommends xserver-xorg xinit matchbox-window-manager arora
    1920
    2021### properly configure X
     
    2425allowed_users=anybody
    2526nice_value=0
    26 EOF
    27 
    28 # make standard xorg.conf
    29 cat <<EOF > "$DEBIRF_ROOT"/etc/X11/xorg.conf
    30 Section "Files"
    31 EndSection
    32 Section "InputDevice"
    33         Identifier      "Generic Keyboard"
    34         Driver          "kbd"
    35         Option          "CoreKeyboard"
    36         Option          "XkbRules"      "xorg"
    37         Option          "XkbModel"      "pc104"
    38         Option          "XkbLayout"     "us"
    39 EndSection
    40 Section "InputDevice"
    41         Identifier      "Configured Mouse"
    42         Driver          "mouse"
    43         Option          "CorePointer"
    44         Option          "Device"                "/dev/input/mice"
    45         Option          "Protocol"              "ImPS/2"
    46         Option          "Emulate3Buttons"       "true"
    47 EndSection
    48 Section "Device"
    49         Identifier      "Generic Video Card"
    50         Driver          "vesa"
    51 EndSection
    52 Section "Monitor"
    53         Identifier "VGA"
    54 EndSection
    55 Section "Screen"
    56         Identifier      "Default Screen"
    57         Device          "Generic Video Card"
    58         Monitor         "VGA"
    59         DefaultDepth    24
    60         SubSection "Display"
    61                 Modes           "1280x1024" "1024x768" "800x600"
    62         EndSubSection
    63 EndSection
    64 Section "ServerLayout"
    65         Identifier      "Default Layout"
    66         Screen          "Default Screen"
    67         InputDevice     "Generic Keyboard"
    68         InputDevice     "Configured Mouse"
    69 EndSection
    7027EOF
    7128
     
    13188cat <<EOF > "$DEBIRF_ROOT"/etc/X11/xinit/xinitrc
    13289#!/bin/sh
    133 xsetroot -solid blue
    13490matchbox-window-manager &
    13591TARG=file://$RUNIT_DIR/index.html
     
    13793  TARG=\$( sed 's/.*browse=\([^[:space:]]*\).*/\1/' </proc/cmdline)
    13894fi
    139 iceweasel \$TARG
     95arora \$TARG
    14096EOF
    14197
Note: See TracChangeset for help on using the changeset viewer.