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

re-enable the default debugging login shell

Browse Source 
svn path=/nixu/trunk/; revision=6048
This commit is contained in:
Armijn Hemel 2006-08-04 23:39:59 +00:00
parent 183b838ed8
commit 33940db2dc
6 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot/boot.sh
View File

@ -21,9 +21,6 @@ mount -n -t devpts none /dev/pts
echo "remounting / writable..." echo "remounting / writable..."
mount -n -o remount,rw /dev/root / mount -n -o remount,rw /dev/root /
echo "starting udev..."
@udev@/sbin/udevstart
echo "setting up hostname..." echo "setting up hostname..."
hostname nixos hostname nixos

3
boot/builder.sh
View File

@ -9,11 +9,9 @@ for i in $boot $halt $login $env; do
dst=$out/bin/$(basename $i | cut -c34-) dst=$out/bin/$(basename $i | cut -c34-)
sed \ sed \
-e "s^@bash\@^$bash^g" \ -e "s^@bash\@^$bash^g" \
-e "s^@bashStatic\@^$bashStatic^g" \
-e "s^@coreutils\@^$coreutils^g" \ -e "s^@coreutils\@^$coreutils^g" \
-e "s^@findutilsWrapper\@^$findutilsWrapper^g" \ -e "s^@findutilsWrapper\@^$findutilsWrapper^g" \
-e "s^@utillinux\@^$utillinux^g" \ -e "s^@utillinux\@^$utillinux^g" \
-e "s^@utillinuxStatic\@^$utillinuxStatic^g" \
-e "s^@sysvinit\@^$sysvinit^g" \ -e "s^@sysvinit\@^$sysvinit^g" \
-e "s^@e2fsprogs\@^$e2fsprogs^g" \ -e "s^@e2fsprogs\@^$e2fsprogs^g" \
-e "s^@nettools\@^$nettools^g" \ -e "s^@nettools\@^$nettools^g" \
@ -39,7 +37,6 @@ for i in $boot $halt $login $env; do
-e "s^@mingettyWrapper\@^$mingettyWrapper^g" \ -e "s^@mingettyWrapper\@^$mingettyWrapper^g" \
-e "s^@module_init_tools\@^$module_init_tools^g" \ -e "s^@module_init_tools\@^$module_init_tools^g" \
-e "s^@grub\@^$grubWrapper^g" \ -e "s^@grub\@^$grubWrapper^g" \
-e "s^@udev\@^$udev^g" \
-e "s^@dhcpWrapper\@^$dhcpWrapper^g" \ -e "s^@dhcpWrapper\@^$dhcpWrapper^g" \
-e "s^@man\@^$man^g" \ -e "s^@man\@^$man^g" \
-e "s^@nano\@^$nano^g" \ -e "s^@nano\@^$nano^g" \

16
boot/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, bash, bashStatic, coreutils, findutilsWrapper, utillinux, utillinuxStatic, sysvinit, e2fsprogs { stdenv, bash, coreutils, findutilsWrapper, utillinux, sysvinit, e2fsprogs
, nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh , nettools, nix, subversion, gcc, wget, which, vim, less, screen, openssh
, binutils, strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , strace, shadowutils, iputils, gnumake, curl, gnused, gnugrep , gnutar, gzip
, gnutar, gzip, mingettyWrapper, grubWrapper, parted, module_init_tools , mingettyWrapper, grubWrapper, parted, module_init_tools, dhcpWrapper
, udev, dhcpWrapper, man, nano}: , man, nano}:
derivation { derivation {
name = "boot"; name = "boot";
@ -12,9 +12,9 @@ derivation {
halt = ./halt.sh; halt = ./halt.sh;
login = ./login.sh; login = ./login.sh;
env = ./env.sh; env = ./env.sh;
inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux sysvinit inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
e2fsprogs nettools nix subversion gcc wget which vim less screen e2fsprogs nettools nix subversion gcc wget which vim less screen
openssh binutils strace shadowutils iputils gnumake curl gnused openssh strace shadowutils iputils gnumake curl gnused
gnutar gnugrep gzip mingettyWrapper grubWrapper parted module_init_tools gnutar gnugrep gzip mingettyWrapper grubWrapper parted
udev dhcpWrapper man nano; module_init_tools dhcpWrapper man nano;
} }

4
fill-disk.sh
View File

@ -10,7 +10,7 @@ export PATH=/bin:/sbin:@bash@/bin:@coreutilsdiet@/bin:@coreutils@/bin:@findutils
kernel=@kernel@ kernel=@kernel@
xawtv=@xawtv@ xawtv=@xawtv@
storePaths=/mystorepaths narStorePaths=/cdrom/narstorepaths
sysvinitPath=@sysvinitPath@ sysvinitPath=@sysvinitPath@
bootPath=@bootPath@ bootPath=@bootPath@
@ -308,6 +308,8 @@ $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix gnugrep
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix linux
$NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub $NIX/nix-env -iKf /nixpkgs/trunk/pkgs/top-level/all-packages.nix grub
cat $narStorePaths | xargs -n 1 -i% $NIX/nix-env -i %
echo setting init symlink... echo setting init symlink...
rm -f $root/init rm -f $root/init
#ln -s $sysvinitPath/sbin/init $root/init #ln -s $sysvinitPath/sbin/init $root/init

17
make-disk.sh
View File

@ -26,6 +26,7 @@ nixpkgs=/nixpkgs/trunk/pkgs
fill_disk=$archivesDir/scripts/fill-disk.sh fill_disk=$archivesDir/scripts/fill-disk.sh
ramdisk_login=$archivesDir/scripts/ramdisk-login.sh ramdisk_login=$archivesDir/scripts/ramdisk-login.sh
storePaths=$archivesDir/mystorepaths storePaths=$archivesDir/mystorepaths
narStorePaths=$archivesDir/narstorepaths
validatePaths=$archivesDir/validatepaths validatePaths=$archivesDir/validatepaths
bootiso=/tmp/nixos.iso bootiso=/tmp/nixos.iso
initrd=/tmp/initram.img initrd=/tmp/initram.img
@ -36,7 +37,9 @@ nix=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).nixUnstable' | $NIX/nix-inst
nixDeps=$($NIX/nix-store -qR $nix) nixDeps=$($NIX/nix-store -qR $nix)
storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -))) #storeExpr=$($NIX/nix-store -qR $($NIX/nix-store -r $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
#storeExpr1=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
storeExpr=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).boot' | $NIX/nix-instantiate -))
#storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -))) #storeExpr=$($NIX/nix-store -r $($NIX/nix-store -qR $(echo '(import ./pkgs.nix).everything' | $NIX/nix-instantiate -)))
### make NAR files for everything we want to install and some more. Make sure ### make NAR files for everything we want to install and some more. Make sure
@ -65,9 +68,14 @@ gnugrep=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).gnugrep' | $NIX/nix-inst
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 -))
combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip) findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
#for i in $storeExpr combideps=$($NIX/nix-store -qR $nix $utillinux $gnugrep $grub $gzip $findutils)
for i in $storeExpr
do
echo $i >> $narStorePaths
done
#for i in $nixDeps #for i in $nixDeps
for i in $combideps for i in $combideps
do do
@ -101,7 +109,7 @@ BootPath=$($NIX/nix-store -qR $(nix-store -r $(echo '(import ./pkgs.nix).boot' |
bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -)) bashGlibc=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bash' | $NIX/nix-instantiate -))
bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -)) bash=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).bashStatic' | $NIX/nix-instantiate -))
coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -)) coreutilsdiet=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).coreutilsDiet' | $NIX/nix-instantiate -))
findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -)) #findutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).findutilsWrapper' | $NIX/nix-instantiate -))
utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -)) utillinux=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).utillinux' | $NIX/nix-instantiate -))
e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -)) e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/nix-instantiate -))
#e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -)) #e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogs' | $NIX/nix-instantiate -))
@ -109,7 +117,6 @@ e2fsprogs=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).e2fsprogsDiet' | $NIX/
modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -)) modutils=$($NIX/nix-store -q $(echo '(import ./pkgs.nix).module_init_toolsStatic' | $NIX/nix-instantiate -))
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 -))
udev=$($NIX/nix-store -r $(echo '(import ./pkgs.nix).udev' | $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 -)) 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 -))

24
pkgs.nix
View File

@ -5,23 +5,23 @@ rec {
nixUnstable subversion gcc wget which vim less screen openssh binutils nixUnstable subversion gcc wget which vim less screen openssh binutils
nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep nixStatic strace shadowutils iputils gnumake curl gnused gnutar gnugrep
gzip mingettyWrapper grubWrapper syslinux parted module_init_tools gzip mingettyWrapper grubWrapper syslinux parted module_init_tools
module_init_toolsStatic udev dhcpWrapper man nano eject sysklogd mktemp module_init_toolsStatic dhcpWrapper man nano eject sysklogd mktemp
cdrtools cpio; cdrtools cpio;
boot = (import ./boot) { boot = (import ./boot) {
inherit stdenv bash bashStatic coreutils findutilsWrapper utillinux inherit stdenv bash coreutils findutilsWrapper utillinux sysvinit
utillinuxStatic sysvinit e2fsprogs nettools subversion gcc wget which e2fsprogs nettools subversion gcc wget which vim less screen openssh
vim less screen openssh binutils strace shadowutils iputils gnumake curl strace shadowutils iputils gnumake curl gnused gnutar gnugrep gzip
gnused gnutar gnugrep gzip mingettyWrapper grubWrapper parted mingettyWrapper grubWrapper parted module_init_tools dhcpWrapper man
module_init_tools udev dhcpWrapper man nano; nano;
nix = nixUnstable; nix = nixUnstable;
}; };
init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet #init = (import ./init) {inherit stdenv bash bashStatic coreutilsDiet
utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools # utillinux shadowutils mingettyWrapper grubWrapper parted module_init_tools
dhcpWrapper man nano eject e2fsprogsDiet; # dhcpWrapper man nano eject e2fsprogsDiet;
nix = nixUnstable; # nix = nixUnstable;
}; #};
everything = [boot sysvinit sysklogd kernel ]; everything = [boot sysvinit sysklogd kernel];
} }