diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/bare-hurd64.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/hurd.scm | 9 | ||||
| -rw-r--r-- | gnu/system/images/hurd.scm | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl index 8d99dffa776..5cb04c2d0fc 100644 --- a/gnu/system/examples/bare-hurd64.tmpl +++ b/gnu/system/examples/bare-hurd64.tmpl | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | (define %hurd64-os | 33 | (define %hurd64-os |
| 34 | (operating-system | 34 | (operating-system |
| 35 | (inherit %hurd64-default-operating-system) | 35 | (inherit %hurd-default-operating-system) |
| 36 | (bootloader (bootloader-configuration | 36 | (bootloader (bootloader-configuration |
| 37 | (bootloader grub-minimal-bootloader) | 37 | (bootloader grub-minimal-bootloader) |
| 38 | (targets '("/dev/sdX")))) | 38 | (targets '("/dev/sdX")))) |
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index fa63a8cbef3..96aeed37dcc 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm | |||
| @@ -52,8 +52,6 @@ | |||
| 52 | %desktop-services/hurd | 52 | %desktop-services/hurd |
| 53 | %hurd-default-operating-system | 53 | %hurd-default-operating-system |
| 54 | %hurd-default-operating-system-kernel | 54 | %hurd-default-operating-system-kernel |
| 55 | %hurd64-default-operating-system | ||
| 56 | %hurd64-default-operating-system-kernel | ||
| 57 | %setuid-programs/hurd)) | 55 | %setuid-programs/hurd)) |
| 58 | 56 | ||
| 59 | ;;; Commentary: | 57 | ;;; Commentary: |
| @@ -66,9 +64,6 @@ | |||
| 66 | (define %hurd-default-operating-system-kernel | 64 | (define %hurd-default-operating-system-kernel |
| 67 | gnumach) | 65 | gnumach) |
| 68 | 66 | ||
| 69 | (define %hurd64-default-operating-system-kernel | ||
| 70 | %hurd-default-operating-system-kernel) | ||
| 71 | |||
| 72 | (define %base-packages/hurd | 67 | (define %base-packages/hurd |
| 73 | ;; Note: the Shepherd comes before the Hurd, not just because its duty is to | 68 | ;; Note: the Shepherd comes before the Hurd, not just because its duty is to |
| 74 | ;; shepherd the herd, but also because we want its 'halt' and 'reboot' | 69 | ;; shepherd the herd, but also because we want its 'halt' and 'reboot' |
| @@ -144,8 +139,4 @@ | |||
| 144 | (privileged-programs '()) | 139 | (privileged-programs '()) |
| 145 | (setuid-programs %setuid-programs/hurd))) | 140 | (setuid-programs %setuid-programs/hurd))) |
| 146 | 141 | ||
| 147 | (define %hurd64-default-operating-system | ||
| 148 | (operating-system | ||
| 149 | (inherit %hurd-default-operating-system) | ||
| 150 | (kernel %hurd64-default-operating-system-kernel))) | ||
| 151 | 142 | ||
diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 0aba57d2f31..ba223b1e0cd 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | 71 | ||
| 72 | (define hurd64-barebones-os | 72 | (define hurd64-barebones-os |
| 73 | (operating-system | 73 | (operating-system |
| 74 | (inherit %hurd64-default-operating-system) | 74 | (inherit %hurd-default-operating-system) |
| 75 | (bootloader (bootloader-configuration | 75 | (bootloader (bootloader-configuration |
| 76 | (bootloader grub-minimal-bootloader) | 76 | (bootloader grub-minimal-bootloader) |
| 77 | (targets '("/dev/sdX")))) | 77 | (targets '("/dev/sdX")))) |
