public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass nano. Not that it actually works, because it also needs ncurses for terminal information... 

svn path=/nixu/trunk/; revision=6321
This commit is contained in:
Armijn Hemel 2006-08-30 00:15:02 +00:00
parent 964780812d
commit e876f67580
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fill-disk.sh
View File

@ -132,6 +132,9 @@ mknod -m 0600 $root/dev/tty2 c 4 2
mknod -m 0600 $root/dev/tty3 c 4 3 mknod -m 0600 $root/dev/tty3 c 4 3
mknod -m 0444 $root/dev/urandom c 1 9 mknod -m 0444 $root/dev/urandom c 1 9
## needed for sshd and friends. Should actually be made by udev.
mknod -m 0666 $root/dev/ptmx c 5 2
rm -f $root/etc/mtab rm -f $root/etc/mtab
ln -s /proc/mounts $root/etc/mtab ln -s /proc/mounts $root/etc/mtab

2
login.sh
View File

@ -1,6 +1,6 @@
#! @bash@/bin/sh -e #! @bash@/bin/sh -e
export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin export PATH=@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils@/bin:@utillinux@/bin:@utillinux@/sbin:@e2fsprogs@/sbin:@grub@/sbin:@sysvinitPath@/sbin:@gnugrep@/bin:@which@/bin:@gnutar@/bin:@busybox@/bin:@busybox@/sbin:@nano@/bin
#tty=$1 #tty=$1

7
make-disk.sh
View File

@ -37,6 +37,8 @@ initscript=$archivesDir/scripts/init.sh
nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -)) nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-instantiate -))
busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -)) busybox=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).busybox' | $NIX/nix-instantiate -))
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
nanoDiet=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nanoDiet' | $NIX/nix-instantiate -))
nixDeps=$($NIX/nix-store -qR $nix) nixDeps=$($NIX/nix-store -qR $nix)
@ -80,7 +82,7 @@ modutils=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).module_init_toolsStatic
dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -)) dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
#combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils) #combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp) combideps=$($NIX/nix-store -qR $nix $busybox $grub $findutils $modutils $dhcp $nano)
for i in $storeExpr $mkinitrd for i in $storeExpr $mkinitrd
do do
@ -128,7 +130,6 @@ modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic
grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -)) grub=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).grubWrapper' | $NIX/nix-instantiate -))
mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -)) mingettyWrapper=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).mingettyWrapper' | $NIX/nix-instantiate -))
dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -)) dhcp=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).dhcpWrapper' | $NIX/nix-instantiate -))
nano=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nano' | $NIX/nix-instantiate -))
gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -)) gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-instantiate -))
which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -)) which=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).which' | $NIX/nix-instantiate -))
eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -)) eject=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).eject' | $NIX/nix-instantiate -))
@ -237,6 +238,7 @@ $gnused/bin/sed -e "s^@sysvinitPath\@^$sysvinitPath^g" \
-e "s^@gnutar\@^$gnutar^g" \ -e "s^@gnutar\@^$gnutar^g" \
-e "s^@mingetty\@^$mingettyWrapper^g" \ -e "s^@mingetty\@^$mingettyWrapper^g" \
-e "s^@busybox\@^$busybox^g" \ -e "s^@busybox\@^$busybox^g" \
-e "s^@nano\@^$nanoDiet^g" \
< $login_script > $login_script.tmp < $login_script > $login_script.tmp
$coreutils/bin/mv $login_script.tmp $login_script $coreutils/bin/mv $login_script.tmp $login_script
@ -306,6 +308,7 @@ $coreutils/bin/cp -fau --parents ${modutils}/bin ${initdir}
$coreutils/bin/chmod -R u+w ${initdir} $coreutils/bin/chmod -R u+w ${initdir}
$coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir} $coreutils/bin/cp -fau --parents ${modutils}/sbin ${initdir}
$coreutils/bin/cp -fau --parents ${busybox} ${initdir} $coreutils/bin/cp -fau --parents ${busybox} ${initdir}
$coreutils/bin/cp -fau --parents ${nanoDiet} ${initdir}
$coreutils/bin/touch ${archivesDir}/NIXOS $coreutils/bin/touch ${archivesDir}/NIXOS

4
pkgs.nix
View File

@ -5,8 +5,8 @@ rec {
e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen e2fsprogs nettools nixUnstable subversion gcc wget which vim less screen
openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused openssh binutils nixStatic strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted gnutar gnugrep gzip mingettyWrapper grubWrapper syslinux parted
module_init_tools module_init_toolsStatic dhcpWrapper man nano eject module_init_tools module_init_toolsStatic dhcpWrapper man nano nanoDiet
sysklogd mktemp cdrtools cpio busybox mkinitrd; eject sysklogd mktemp cdrtools cpio busybox mkinitrd;
boot = (import ./boot) { boot = (import ./boot) {
inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit