summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--README.md5
-rw-r--r--layout/initramfs/bin/.empty0
-rw-r--r--layout/initramfs/command/.empty0
-rw-r--r--layout/initramfs/dev/.empty0
-rw-r--r--layout/initramfs/etc/.empty0
-rwxr-xr-xlayout/initramfs/init49
-rw-r--r--layout/initramfs/proc/.empty0
-rw-r--r--layout/initramfs/rootfs/.empty0
-rw-r--r--layout/initramfs/sys/.empty0
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-coldplug/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-dev/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/klogd/dependencies2
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-devpts/down1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/type1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-proc/up3
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/type1
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-sys/up3
-rw-r--r--layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents2
-rwxr-xr-xqemu-boot2
-rwxr-xr-xsub/disk-image/make-disk-image10
-rw-r--r--sub/initramfs/Makefile27
-rw-r--r--sub/initramfs/kill.c55
-rw-r--r--sub/kernel/Makefile3
-rw-r--r--sub/kernel/qemu-system-aarch64-config10
-rw-r--r--sub/kernel/qemu-system-arm-config10
-rw-r--r--sub/kernel/qemu-system-x86_64-config10
-rw-r--r--sub/kernel/wireless-db.txt1215
-rwxr-xr-xsub/layout/copylayout6
35 files changed, 45 insertions, 1386 deletions
diff --git a/Makefile b/Makefile
index e6c3fc2..98891ed 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ clean:
# Prepare the output directory. This is at the bottom of the dependency tree.
$(OUTPUT)/tmp/.lh_prepared: lh-config
- exec mkdir -p -m 0755 -- $(OUTPUT)/tmp $(OUTPUT)/initramfs $(OUTPUT)/rootfs $(OUTPUT)/rwfs $(OUTPUT)/userfs $(OUTPUT)/build-build/bin $(OUTPUT)/build-build/opt $(OUTPUT)/build-build/tmp $(OUTPUT)/build-host/bin $(OUTPUT)/build-host/opt $(OUTPUT)/build-host/tmp $(OUTPUT)/host-host $(OUTPUT)/sources
+ exec mkdir -p -m 0755 -- $(OUTPUT)/tmp $(OUTPUT)/rootfs $(OUTPUT)/rwfs $(OUTPUT)/userfs $(OUTPUT)/build-build/bin $(OUTPUT)/build-build/opt $(OUTPUT)/build-build/tmp $(OUTPUT)/build-host/bin $(OUTPUT)/build-host/opt $(OUTPUT)/build-host/tmp $(OUTPUT)/host-host $(OUTPUT)/sources
exec chown -R -- $(NORMALUSER_UID):$(NORMALUSER_GID) $(OUTPUT)/tmp $(OUTPUT)/build-build $(OUTPUT)/build-host $(OUTPUT)/host-host
exec chown -- $(NORMALUSER_UID):$(NORMALUSER_GID) $(OUTPUT)/sources $(OUTPUT)
exec setuidgid $(NORMALUSER) touch $@
@@ -86,13 +86,13 @@ $(OUTPUT)/build-build/.lh_done: $(OUTPUT)/build-build/.lh_gcc $(OUTPUT)/build-bu
# The rootfs
-$(OUTPUT)/tmp/.lh_rootfs_installed: $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-host/.lh_skarnet_installed $(OUTPUT)/build-host/.lh_socklog_installed $(OUTPUT)/build-host/.lh_bb_installed $(OUTPUT)/build-host/.lh_bbsuid_installed $(OUTPUT)/build-host/.lh_dnscache_installed $(OUTPUT)/build-host/.lh_dropbear_installed $(OUTPUT)/tmp/.lh_initramfs_done $(OUTPUT)/build-host/kernel/.lh_installed
+$(OUTPUT)/tmp/.lh_rootfs_installed: $(OUTPUT)/tmp/.lh_layout_installed $(OUTPUT)/build-host/.lh_skarnet_installed $(OUTPUT)/build-host/.lh_socklog_installed $(OUTPUT)/build-host/.lh_bb_installed $(OUTPUT)/build-host/.lh_bbsuid_installed $(OUTPUT)/build-host/.lh_dnscache_installed $(OUTPUT)/build-host/.lh_dropbear_installed $(OUTPUT)/build-host/kernel/.lh_installed
exec setuidgid $(NORMALUSER) touch $@
# Disk images (raw for qemu, vmdk for virtualbox and vmware)
-$(OUTPUT)/tmp/.lh_installed: $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/tmp/.lh_initramfs_done $(OUTPUT)/build-host/kernel/.lh_installed
+$(OUTPUT)/tmp/.lh_installed: $(OUTPUT)/tmp/.lh_rootfs_installed $(OUTPUT)/build-host/kernel/.lh_installed
exec setuidgid $(NORMALUSER) touch $@
$(OUTPUT)/tmp/.lh_diskimage_done: $(OUTPUT)/tmp/.lh_installed $(OUTPUT)/build-build/.lh_done
@@ -134,7 +134,6 @@ include sub/kmod/Makefile
## rootfs contents, what's necessary to get an image to boot and connect to it via ssh
include sub/layout/Makefile
-include sub/initramfs/Makefile
include sub/bearssl/Makefile
include sub/skarnet.org/Makefile
include sub/socklog/Makefile
diff --git a/README.md b/README.md
index 0714556..afdf7a6 100644
--- a/README.md
+++ b/README.md
@@ -217,16 +217,17 @@ The filesystems will be built under the `./output` directory, or
whatever directory you specified in the OUTPUT variable in `lh-config`.
Under this directory, once the build has completed:
-- `initramfs`, `rootfs`, `rwfs` and `userfs` are the contents of the
+- `rootfs`, `rwfs` and `userfs` are the contents of the
respective filesystems of the target. You can use those to make tarballs,
for instance.
- `kernel` is the kernel binary, to be given to qemu.
-- `initramfs.img.gz` is the compressed initramfs image, to be given to qemu.
- `disk-image.raw` is the complete raw disk image, suitable for qemu or to be
burned onto a real disk or SD card. By default it is huge, but it's a
sparse file, i.e. it's not really using all that space, only the parts
that have actually been written to (which is a small portion of the total
space).
+- Previous versions of `lh-bootstrap` built an initramfs. This has
+been removed.
### Running on backends
diff --git a/layout/initramfs/bin/.empty b/layout/initramfs/bin/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/bin/.empty
+++ /dev/null
diff --git a/layout/initramfs/command/.empty b/layout/initramfs/command/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/command/.empty
+++ /dev/null
diff --git a/layout/initramfs/dev/.empty b/layout/initramfs/dev/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/dev/.empty
+++ /dev/null
diff --git a/layout/initramfs/etc/.empty b/layout/initramfs/etc/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/etc/.empty
+++ /dev/null
diff --git a/layout/initramfs/init b/layout/initramfs/init
deleted file mode 100755
index e34ff9f..0000000
--- a/layout/initramfs/init
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/command/execlineb -S0
-
-# This initramfs is a stub. It just performs coldplug.
-# Since our rootfs shouldn't require a coldplug to be found,
-# we could do away with the initramfs, but we leave it as an example.
-
-/command/export PATH /command:/bin
-/command/cd /
-if { s6-echo "\n initramfs (minimal)\n" }
-
-if { s6-mount -wt sysfs sys /sys }
-if { s6-mount -wt proc proc /proc }
-if { s6-mount -wt devtmpfs dev /dev }
-
-
-piperw 4 5
-background
-{
- fdclose 4
- mdevd -D 5
-}
-importas -u MDEVDPID !
-fdclose 5
-if -n { fdmove 0 4 forstdin -x 1 -- i exit 1 } # readiness notif.
-fdclose 4
-if { mdevd-coldplug }
-if { kill $MDEVDPID }
-
-if { s6-mount -rt ext4 /dev/%%PARTITION%%1 /rootfs }
-
-if { s6-mount -o move /sys /rootfs/sys }
-if { s6-mount -o move /proc /rootfs/proc }
-if { s6-mount -o move /dev /rootfs/dev }
-
-cd /rootfs
-./command/s6-envdir -I /etc/env
-./command/if
-{
- ./command/pipeline { ./command/s6-ls -a -x rootfs / }
- ./command/forstdin -p -d"\n" i
- ./command/importas -u i i
- ./command/s6-rmrf /${i}
-}
-./command/if { ./command/s6-mount -o move . / }
-./command/s6-chroot .
-
-./command/tryexec { /sbin/init $@ }
-./command/tryexec { /bin/init $@ }
-/etc/init $@
diff --git a/layout/initramfs/proc/.empty b/layout/initramfs/proc/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/proc/.empty
+++ /dev/null
diff --git a/layout/initramfs/rootfs/.empty b/layout/initramfs/rootfs/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/rootfs/.empty
+++ /dev/null
diff --git a/layout/initramfs/sys/.empty b/layout/initramfs/sys/.empty
deleted file mode 100644
index e69de29..0000000
--- a/layout/initramfs/sys/.empty
+++ /dev/null
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
index 18fefaa..2820f48 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/dependencies
@@ -1,2 +1,3 @@
+mount-sys
init-dev
mdevd
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down b/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down
deleted file mode 100644
index 8b13789..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-coldplug/down
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
index eec2035..fc811ee 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-dev/dependencies
@@ -1 +1,2 @@
init-run
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-dev/down b/layout/rootfs/etc/s6-rc/source-base/init-dev/down
deleted file mode 100644
index 8b13789..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/init-dev/down
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
index 4daddb7..0df58a3 100644
--- a/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/init-sysctl/dependencies
@@ -1 +1 @@
-00
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
index 4daddb7..0df58a3 100644
--- a/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/klogd/dependencies
@@ -1 +1 @@
-00
+mount-proc
diff --git a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
index c1ee812..690f6cf 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
+++ b/layout/rootfs/etc/s6-rc/source-base/mdevd/dependencies
@@ -1 +1,2 @@
+mount-sys
init-dev
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down b/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down
deleted file mode 100644
index f886363..0000000
--- a/layout/rootfs/etc/s6-rc/source-base/mount-devpts/down
+++ /dev/null
@@ -1 +0,0 @@
-s6-umount /dev/pts
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/type b/layout/rootfs/etc/s6-rc/source-base/mount-proc/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-proc/up b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
new file mode 100644
index 0000000..1eeaa8a
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-proc/up
@@ -0,0 +1,3 @@
+foreground { s6-mount -wt proc proc /proc }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
new file mode 100644
index 0000000..4daddb7
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/dependencies
@@ -0,0 +1 @@
+00
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/type b/layout/rootfs/etc/s6-rc/source-base/mount-sys/type
new file mode 100644
index 0000000..bdd22a1
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/type
@@ -0,0 +1 @@
+oneshot
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-sys/up b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
new file mode 100644
index 0000000..9573fe4
--- /dev/null
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-sys/up
@@ -0,0 +1,3 @@
+foreground { s6-mount -wt sysfs sys /sys }
+importas ? ?
+s6-test $? -le 1
diff --git a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
index c78c4a4..4f9af9e 100644
--- a/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
+++ b/layout/rootfs/etc/s6-rc/source-base/mount-virtual/contents
@@ -1,2 +1,4 @@
+mount-proc
+mount-sys
mount-devpts
mount-cgroups
diff --git a/qemu-boot b/qemu-boot
index 54103e1..b5f2a85 100755
--- a/qemu-boot
+++ b/qemu-boot
@@ -61,11 +61,9 @@ fi
# echo qemu-system-$QEMU_ARCH $nographic $qemu_sysoptions $qemu_guestnetoptions $qemu_hostnetoptions \
# -append "console=$qemu_console" \
# -kernel "$OUTPUT/kernel" \
-# -initrd "$OUTPUT/initramfs.img.gz" \
# $diskoption
exec qemu-system-$QEMU_ARCH $nographic $qemu_sysoptions $qemu_guestnetoptions $qemu_hostnetoptions \
-append "console=$qemu_console" \
-kernel "$OUTPUT/kernel" \
- -initrd "$OUTPUT/initramfs.img.gz" \
$diskoption
diff --git a/sub/disk-image/make-disk-image b/sub/disk-image/make-disk-image
index 64d2c40..a7a2f97 100755
--- a/sub/disk-image/make-disk-image
+++ b/sub/disk-image/make-disk-image
@@ -1,7 +1,5 @@
#!/bin/sh -e
-# umount is given with -l because some operating systems have triggers that will launch processes keep file descriptors open to the mount, preventing unmounting
-
output="$1"
rootfs_size="$2"
swap_size="$3"
@@ -18,7 +16,9 @@ if s6-test ${KERNEL_GENERIC_ARCH} = x86 ; then
if ${USE_GRAPHIC} ; then
consolearg=
fi
- if s6-test ${KERNEL_ARCH} = x86_64 ; then
+ if ${USE_VIRTIO_DISK} ; then
+ bootpartition=/dev/vda1
+ elif s6-test ${KERNEL_ARCH} = x86_64 ; then
bootpartition=/dev/sda1
else
bootpartition=/dev/hda1
@@ -32,8 +32,7 @@ totaltimeout 1200
say extlinux booting
label linux
linux /boot/vmlinuz
- initrd /boot/initramfs.gz
- append ro root=$bootpartition rootfstype=ext4 loglevel=4 initrd=/boot/initramfs.gz $consolearg
+ append ro root=$bootpartition rootfstype=ext4 loglevel=4 $consolearg
EOF
fi
@@ -84,7 +83,6 @@ losetup -P "$loop" "$output/disk-image.raw"
mkfs.ext4 -O ^huge_file ${loop}p5
mkfs.ext4 -O ^huge_file ${loop}p6
-
s6-mkdir -p "$output/tmp/rootfs" "$output/tmp/rwfs" "$output/tmp/userfs" "$output/tmp/stagingfs"
mount -t ext4 ${loop}p1 "$output/tmp/rootfs"
s6-hiercopy "$output/rootfs" "$output/tmp/rootfs"
diff --git a/sub/initramfs/Makefile b/sub/initramfs/Makefile
deleted file mode 100644
index e175160..0000000
--- a/sub/initramfs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# The initramfs
-
-INITRAMFS_SKARNET_LIST := background cd execlineb exit export fdclose fdmove forstdin if importas piperw pipeline redirfd s6-echo s6-mount mdevd-coldplug mdevd
-
-$(OUTPUT)/tmp/.lh_initramfs_installed: $(OUTPUT)/tmp/.lh_layout_copied $(OUTPUT)/build-host/.lh_skarnet_installed $(OUTPUT)/initramfs/bin/kill
- for i in $(INITRAMFS_SKARNET_LIST) ; do cp -f -L $(OUTPUT)/rootfs/command/$$i $(OUTPUT)/initramfs/command/$$i ; done
- exec setuidgid $(NORMALUSER) touch $@
-
-$(OUTPUT)/initramfs/bin/kill: $(OUTPUT)/tmp/kill
- exec cp -f $< $@
-
-$(OUTPUT)/tmp/kill: $(OUTPUT)/build-host/.lh_skarnet_installed sub/initramfs/kill.c $(OUTPUT)/build-host/bin/muslgcc
- exec setuidgid $(NORMALUSER) $(OUTPUT)/build-host/bin/muslgcc -O2 -pipe -s -static -fomit-frame-pointer -fno-exceptions -fno-unwind-tables -fno-asynchronous-unwind-tables -Wa,--noexecstack -fno-stack-protector -ffunction-sections -fdata-sections -Wl,--sort-section=alignment -Wl,--sort-common -Wl,--gc-sections -o $@ -I$(OUTPUT)/rootfs/package/prog/skalibs/include -L$(OUTPUT)/rootfs/package/prog/skalibs/library sub/initramfs/kill.c -lskarnet
-
-$(OUTPUT)/initramfs.img.gz: $(OUTPUT)/tmp/.lh_initramfs_installed
- cd $(OUTPUT)/initramfs && find . | cpio -o --format=newc > ../initramfs.img && cd .. && rm -f $@ && gzip -9 initramfs.img
-
-$(OUTPUT)/rootfs/boot/initramfs.gz: $(OUTPUT)/initramfs.img.gz | $(OUTPUT)/build-build/.lh_skarnet_installed $(OUTPUT)/tmp/.lh_layout_copied
- exec cp -f $(OUTPUT)/initramfs.img.gz $(OUTPUT)/rootfs/boot/initramfs-$(KERNEL_VERSION).gz
- exec s6-ln -sf initramfs-$(KERNEL_VERSION).gz $@
-
-ifeq ($(KERNEL_GENERIC_ARCH),x86)
-$(OUTPUT)/tmp/.lh_initramfs_done: $(OUTPUT)/rootfs/boot/initramfs.gz
-else
-$(OUTPUT)/tmp/.lh_initramfs_done: $(OUTPUT)/initramfs.img.gz
-endif
- exec setuidgid $(NORMALUSER) touch $@
diff --git a/sub/initramfs/kill.c b/sub/initramfs/kill.c
deleted file mode 100644
index 9279a77..0000000
--- a/sub/initramfs/kill.c
+++ /dev/null
@@ -1,55 +0,0 @@
- /* GPLv2 license. */
-
-#include <skalibs/nonposix.h>
-#include <signal.h>
-#include <skalibs/types.h>
-#include <skalibs/sgetopt.h>
-#include <skalibs/strerr2.h>
-#include <skalibs/sig.h>
-#include <skalibs/nsig.h>
-
-#define USAGE "kill [ -s SIGNAME ] pids..."
-#define dieusage() strerr_dieusage(100, USAGE)
-
-int main (int argc, char const *const *argv)
-{
- int sig = 15 ;
- PROG = "kill" ;
- {
- subgetopt_t l = SUBGETOPT_ZERO ;
- for (;;)
- {
- int opt = subgetopt_r(argc, argv, "s:", &l) ;
- if (opt == -1) break ;
- switch (opt)
- {
- case 's':
- {
- sig = sig_number(l.arg) ;
- if (!sig)
- {
- unsigned int u ;
- if (!uint0_scan(l.arg, &u)) dieusage() ;
- if (u > SKALIBS_NSIG) dieusage() ;
- sig = u ;
- }
- break ;
- }
- default : dieusage() ;
- }
- }
- argc -= l.ind ; argv += l.ind ;
- }
- if (!argc) dieusage() ;
-
- {
- pid_t pids[argc] ;
- for (unsigned int i = 0 ; i < argc ; i++)
- if (!pid0_scan(argv[i], pids + i)) dieusage() ;
- for (unsigned int i = 0 ; i < argc ; i++)
- if (kill(pids[i], sig) < 0)
- strerr_warnwu2sys("kill pid ", argv[i]) ;
- }
- return 0 ;
-}
-
diff --git a/sub/kernel/Makefile b/sub/kernel/Makefile
index 5f6c9e9..cf1dcbd 100644
--- a/sub/kernel/Makefile
+++ b/sub/kernel/Makefile
@@ -24,8 +24,7 @@ $(OUTPUT)/build-host/kernel/.lh_unpacked: $(OUTPUT)/sources/linux-$(KERNEL_VERSI
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel tar Jxpvf $(OUTPUT)/sources/linux-$(KERNEL_VERSION).tar.xz
exec setuidgid $(NORMALUSER) s6-touch $@
-$(OUTPUT)/build-host/kernel/.lh_configured: $(OUTPUT)/build-host/kernel/.lh_unpacked sub/kernel/wireless-db.txt $(KERNEL_CONFIG) | $(OUTPUT)/build-build/.lh_skarnet_installed
- exec setuidgid $(NORMALUSER) cp -f sub/kernel/wireless-db.txt $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/net/wireless/db.txt
+$(OUTPUT)/build-host/kernel/.lh_configured: $(OUTPUT)/build-host/kernel/.lh_unpacked $(KERNEL_CONFIG) | $(OUTPUT)/build-build/.lh_skarnet_installed
exec setuidgid $(NORMALUSER) cp -f $(KERNEL_CONFIG) $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION)/.config
exec setuidgid $(NORMALUSER) cd $(OUTPUT)/build-host/kernel/linux-$(KERNEL_VERSION) $(MAKE) olddefconfig $(KERNEL_ENV)
exec setuidgid $(NORMALUSER) s6-touch $@
diff --git a/sub/kernel/qemu-system-aarch64-config b/sub/kernel/qemu-system-aarch64-config
index a0381fa..3d411d8 100644
--- a/sub/kernel/qemu-system-aarch64-config
+++ b/sub/kernel/qemu-system-aarch64-config
@@ -798,8 +798,8 @@ CONFIG_ARM_AMBA=y
#
# Generic Driver Options
#
-CONFIG_UEVENT_HELPER=y
-CONFIG_UEVENT_HELPER_PATH="/bin/hotplug"
+CONFIG_UEVENT_HELPER=n
+CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
@@ -1867,7 +1867,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXT4_FS_SECURITY is not set
# CONFIG_EXT4_ENCRYPTION is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
+# CONFIG_JBD2 is not set
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
@@ -1946,8 +1946,8 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
CONFIG_SQUASHFS_DECOMP_SINGLE=y
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
diff --git a/sub/kernel/qemu-system-arm-config b/sub/kernel/qemu-system-arm-config
index b944f2a..1d48206 100644
--- a/sub/kernel/qemu-system-arm-config
+++ b/sub/kernel/qemu-system-arm-config
@@ -830,10 +830,10 @@ CONFIG_ARM_AMBA=y
#
# Generic Driver Options
#
-CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER=n
CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_DEVTMPFS_MOUNT=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=m
@@ -1923,7 +1923,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXT4_FS_SECURITY is not set
# CONFIG_EXT4_ENCRYPTION is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
+# CONFIG_JBD2 is not set
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
@@ -1991,8 +1991,8 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
CONFIG_SQUASHFS=m
-CONFIG_SQUASHFS_FILE_CACHE=y
-# CONFIG_SQUASHFS_FILE_DIRECT is not set
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
CONFIG_SQUASHFS_DECOMP_SINGLE=y
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
diff --git a/sub/kernel/qemu-system-x86_64-config b/sub/kernel/qemu-system-x86_64-config
index 3b8f119..ea071b4 100644
--- a/sub/kernel/qemu-system-x86_64-config
+++ b/sub/kernel/qemu-system-x86_64-config
@@ -927,10 +927,10 @@ CONFIG_HAVE_EBPF_JIT=y
#
# Generic Driver Options
#
-CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER=n
CONFIG_UEVENT_HELPER_PATH=""
CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
CONFIG_FW_LOADER=m
@@ -2232,7 +2232,7 @@ CONFIG_EXT4_USE_FOR_EXT2=y
# CONFIG_EXT4_FS_SECURITY is not set
# CONFIG_EXT4_ENCRYPTION is not set
# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD2=y
+# CONFIG_JBD2 is not set
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
@@ -2297,8 +2297,8 @@ CONFIG_SYSFS=y
CONFIG_TMPFS=y
# CONFIG_TMPFS_POSIX_ACL is not set
# CONFIG_TMPFS_XATTR is not set
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
CONFIG_CONFIGFS_FS=m
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_ORANGEFS_FS is not set
diff --git a/sub/kernel/wireless-db.txt b/sub/kernel/wireless-db.txt
deleted file mode 100644
index df7f7b1..0000000
--- a/sub/kernel/wireless-db.txt
+++ /dev/null
@@ -1,1215 +0,0 @@
-# This is the world regulatory domain
-country 00:
- (2402 - 2472 @ 40), (20)
- # Channel 12 - 13.
- (2457 - 2482 @ 40), (20), NO-IR
- # Channel 14. Only JP enables this and for 802.11b only
- (2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
- # Channel 36 - 48
- (5170 - 5250 @ 80), (20), NO-IR, AUTO-BW
- # Channel 52 - 64
- (5250 - 5330 @ 80), (20), NO-IR, DFS, AUTO-BW
- # Channel 100 - 144
- (5490 - 5730 @ 160), (20), NO-IR, DFS
- # Channel 149 - 165
- (5735 - 5835 @ 80), (20), NO-IR
- # IEEE 802.11ad (60GHz), channels 1..3
- (57240 - 63720 @ 2160), (0)
-
-
-country AD:
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5490 - 5710 @ 80), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country AE: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country AF: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://pucanguilla.org/Downloads/January2005-Anguilla%20Table%20of%20Allocations.pdf
-country AI: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country AL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20.00), AUTO-BW
- (5250 - 5330 @ 80), (20.00), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27.00), DFS
-
-country AM: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (18)
- (5250 - 5330 @ 80), (18), DFS
-
-country AN: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country AR: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country AS: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country AT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country AU:
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5710 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country AW: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country AZ: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (18), AUTO-BW
- (5250 - 5330 @ 80), (18), DFS, AUTO-BW
-
-country BA: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country BB: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country BD: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5735 - 5835 @ 80), (30)
-
-country BE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country BF: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country BG: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country BH: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5735 - 5835 @ 80), (20)
-
-country BL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country BM: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country BN: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5735 - 5835 @ 80), (20)
-
-country BO: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5250 - 5330 @ 80), (30), DFS
- (5735 - 5835 @ 80), (30)
-
-country BR: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country BS: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.bicma.gov.bt/paper/publication/nrrpart4.pdf
-country BT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country BY: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country BZ: DFS-JP
- (2402 - 2482 @ 40), (30)
- (5735 - 5835 @ 80), (30)
-
-country CA: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.art-rca.org
-country CF: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 40), (17)
- (5250 - 5330 @ 40), (24), DFS
- (5490 - 5730 @ 40), (24), DFS
- (5735 - 5835 @ 40), (30)
-
-country CH: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country CI: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country CL: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5735 - 5835 @ 80), (20)
-
-country CN: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
- # 60 gHz band channels 1,4: 28dBm, channels 2,3: 44dBm
- # ref: http://www.miit.gov.cn/n11293472/n11505629/n11506593/n11960250/n11960606/n11960700/n12330791.files/n12330790.pdf
- (57240 - 59400 @ 2160), (28)
- (59400 - 63720 @ 2160), (44)
- (63720 - 65880 @ 2160), (28)
-
-country CO: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country CR: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country CX: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country CY: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-# Data from http://www.ctu.eu/164/download/VOR/VOR-12-08-2005-34.pdf
-# and http://www.ctu.eu/164/download/VOR/VOR-12-05-2007-6-AN.pdf
-# Power at 5250 - 5350 MHz and 5470 - 5725 MHz can be doubled if TPC is
-# implemented.
-country CZ: DFS-ETSI
- (2400 - 2483.5 @ 40), (100 mW)
- (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
- (5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-# Data from "Frequenznutzungsplan" (as published in April 2008), downloaded from
-# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38448/publicationFile/2659/Frequenznutzungsplan2008_Id17448pdf.pdf
-# For the 5GHz range also see
-# http://www.bundesnetzagentur.de/cae/servlet/contentblob/38216/publicationFile/6579/WLAN5GHzVfg7_2010_28042010pdf.pdf
-# The values have been reduced by a factor of 2 (3db) for non TPC devices
-# (in other words: devices with TPC can use twice the tx power of this table).
-# Note that the docs do not require TPC for 5150--5250; the reduction to
-# 100mW thus is not strictly required -- however the conservative 100mW
-# limit is used here as the non-interference with radar and satellite
-# apps relies on the attenuation by the building walls only in the
-# absence of DFS; the neighbour countries have 100mW limit here as well.
-
-country DE: DFS-ETSI
- # entries 279004 and 280006
- (2400 - 2483.5 @ 40), (100 mW)
- # entry 303005
- (5150 - 5250 @ 80), (100 mW), NO-OUTDOOR, AUTO-BW
- # entries 304002 and 305002
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
- # entries 308002, 309001 and 310003
- (5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country DK: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-# Source:
-# http://www.ntrcdom.org/index.php?option=com_content&view=category&layout=blog&id=10&Itemid=55
-country DM: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country DO: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country DZ: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170.000 - 5250.000 @ 80.000), (23.00), AUTO-BW
- (5250.000 - 5330.000 @ 80.000), (23.00), DFS, AUTO-BW
- (5490.000 - 5670.000 @ 160.000), (23.00), DFS
-
-country EC: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country EE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country EG: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
-
-# Orden IET/787/2013, de 25 de abril, por la que se aprueba
-# el cuadro nacional de atribución de frecuencias.
-# http://www.boe.es/diario_boe/txt.php?id=BOE-A-2013-4845
-#
-# more info at "Cuadro nacional de atribución de frecuencias (CNAF)":
-# http://www.minetur.gob.es/telecomunicaciones/espectro/paginas/cnaf.aspx
-
-country ES: DFS-ETSI
- (2400 - 2483.5 @ 40), (100 mW)
- (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
- (5250 - 5350 @ 80), (100 mW), NO-OUTDOOR, DFS, AUTO-BW
- (5470 - 5725 @ 160), (500 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country ET: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country FI: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country FM: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country FR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country GB: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country GD: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country GE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (18), AUTO-BW
- (5250 - 5330 @ 80), (18), DFS, AUTO-BW
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country GF: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country GH: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country GL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5490 - 5710 @ 80), (27), DFS
-
-country GP: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country GR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country GT: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country GU: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country GY:
- (2402 - 2482 @ 40), (30)
- (5735 - 5835 @ 80), (30)
-
-country HK:
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5710 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country HN: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country HR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country HT: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country HU: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country ID: DFS-JP
- # ref: http://www.postel.go.id/content/ID/regulasi/standardisasi/kepdir/bwa%205,8%20ghz.pdf
- (2402 - 2482 @ 40), (20)
- (5735 - 5815 @ 80), (23)
-
-country IE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country IL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5150 - 5250 @ 80), (200 mW), NO-OUTDOOR, AUTO-BW
- (5250 - 5350 @ 80), (200 mW), NO-OUTDOOR, DFS, AUTO-BW
-
-country IN: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5735 - 5835 @ 80), (20)
-
-country IR: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5735 - 5835 @ 80), (30)
-
-country IS: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country IT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country JM: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country JO: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23)
- (5735 - 5835 @ 80), (23)
-
-country JP: DFS-JP
- (2402 - 2482 @ 40), (20)
- (2474 - 2494 @ 20), (20), NO-OFDM
- (4910 - 4990 @ 40), (23)
- (5030 - 5090 @ 40), (23)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (23), DFS
-
-country KE: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (23)
- (5490 - 5570 @ 80), (30), DFS
- (5735 - 5775 @ 40), (23)
-
-country KH: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source
-# http://ntrc.kn/?page_id=7
-country KN: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (30), DFS
- (5735 - 5815 @ 80), (30)
-
-country KP: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5630 @ 80), (30), DFS
- (5735 - 5815 @ 80), (30)
-
-country KR: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (30), DFS
- (5735 - 5835 @ 80), (30)
-
-country KW: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country KY: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country KZ:
- (2402 - 2482 @ 40), (20)
-
-country LB: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.ntrc.org.lc/operational_structures.htm
-country LC: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (30), DFS
- (5735 - 5815 @ 80), (30)
-
-country LI: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country LK: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://lca.org.ls/images/documents/lesotho_national_frequency_allocation_plan.pdf
-country LS: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country LT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country LU: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country LV: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country MA: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country MC: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.cnfr.md/index.php?pag=sec&id=117&l=en
-country MD: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.cept.org/files/1050/Tools%20and%20Services/EFIS%20-%20ECO%20Frequency%20Information%20System/National%20frequency%20tables/Montenegro%20NAFT%20-%202010.pdf
-country ME: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country MF: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country MH: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country MK: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country MN: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country MO:
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 40), (23)
- (5250 - 5330 @ 40), (23), DFS
- (5735 - 5835 @ 40), (30)
-
-country MP: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country MQ: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# http://www.are.mr/pdfs/telec_freq_TNAbf_2010.pdf
-country MR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country MT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country MU: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country MW: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country MX: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country MY: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country NI: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country NL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), NO-OUTDOOR, AUTO-BW
- (5250 - 5330 @ 80), (20), NO-OUTDOOR, DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-# Data from http://www.lovdata.no/dokument/SF/forskrift/2012-01-19-77
-# Power at 5250 - 5350 MHz, 5470 - 5725 MHz and 5815 – 5850 MHz can
-# be doubled if TPC is implemented.
-# Up to 2W (or 4W with TPC) is allowed in the 5725 – 5795 MHz band
-# which has been merged with 5470 - 5725 MHz to allow wide channels
-country NO: DFS-ETSI
- (2400 - 2483.5 @ 40), (100 mW)
- (5150 - 5250 @ 80), (200 mW), AUTO-BW
- (5250 - 5350 @ 80), (100 mW), DFS, AUTO-BW
- (5470 - 5795 @ 160), (500 mW), DFS
- (5815 - 5850 @ 35), (2000 mW), DFS
- (17100 - 17300 @ 200), (100 mW)
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country NP: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5735 - 5835 @ 80), (20)
-
-country NZ: DFS-FCC
- (2402 - 2482 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country OM: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country PA: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country PE: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country PF: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country PG: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country PH: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country PK: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5735 - 5835 @ 80), (30)
-
-country PL: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country PM: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country PR: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country PT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country PW: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country PY: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country QA: DFS-JP
- (2402 - 2482 @ 40), (20)
- (5735 - 5835 @ 80), (30)
-
-country RE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country RO: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-
-# Source:
-# http://www.ratel.rs/upload/documents/Plan_namene/Plan_namene-sl_glasnik.pdf
-country RS: DFS-ETSI
- (2400 - 2483.5 @ 40), (100 mW)
- (5150 - 5350 @ 40), (200 mW), NO-OUTDOOR
- (5470 - 5725 @ 20), (1000 mW), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country RU: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20)
- (5250 - 5330 @ 80), (20), DFS
- (5650 - 5730 @ 80), (30), DFS
- (5735 - 5835 @ 80), (30)
-
-country RW: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country SA: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country SE: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country SG: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country SI: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country SK: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-# Source:
-# Regulation N° 2004-005 ART/DG/DRC/D.Rég
-country SN: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country SR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country SV: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (23), DFS
- (5735 - 5835 @ 80), (30)
-
-country SY:
- (2402 - 2482 @ 40), (20)
-
-# Source:
-# http://www.telecommission.tc/Spectrum-plan20110324-101210.html
-country TC: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country TD: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country TG: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 40), (20)
- (5250 - 5330 @ 40), (20), DFS
- (5490 - 5710 @ 40), (27), DFS
-
-country TH: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country TN: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-country TR: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country TT: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country TW: DFS-JP
- (2402 - 2472 @ 40), (30)
- (5270 - 5330 @ 40), (17), DFS
- (5490 - 5590 @ 80), (30), DFS
- (5650 - 5710 @ 40), (30), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# #914 / 06 Sep 2007: http://www.ucrf.gov.ua/uk/doc/nkrz/1196068874
-# #1174 / 23 Oct 2008: http://www.nkrz.gov.ua/uk/activities/ruling/1225269361
-# (appendix 8)
-# Listed 5GHz range is a lowest common denominator for all related
-# rules in the referenced laws. Such a range is used because of
-# disputable definitions there.
-country UA: DFS-ETSI
- (2400 - 2483.5 @ 40), (20), NO-OUTDOOR
- (5150 - 5350 @ 40), (20), NO-OUTDOOR
- (5490 - 5670 @ 80), (20), DFS
- (5735 - 5835 @ 80), (20)
- # 60 gHz band channels 1-4, ref: Etsi En 302 567
- (57000 - 66000 @ 2160), (40)
-
-country UG: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country US: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
- # 60g band
- # reference: http://cfr.regstoday.com/47cfr15.aspx#47_CFR_15p255
- # channels 1,2,3, EIRP=40dBm(43dBm peak)
- (57240 - 63720 @ 2160), (40)
-
-country UY: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://cemc.uz/article/1976/
-country UZ: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
-
-# Source:
-# http://www.ntrc.vc/regulations/Jun_2006_Spectrum_Managment_Regulations.pdf
-country VC: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-# Source:
-# Official Gazette (Gaceta Oficial) concerning Unlicensed transmitter use
-# (10 June 2013)
-# http://www.conatel.gob.ve/
-country VE: DFS-FCC
- (2402 - 2482 @ 40), (30)
- (5170 - 5250 @ 80), (23), AUTO-BW
- (5250 - 5330 @ 80), (23), DFS, AUTO-BW
- (5735 - 5835 @ 80), (30)
-
-country VI: DFS-FCC
- (2402 - 2472 @ 40), (30)
- (5170 - 5250 @ 80), (24), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country VN: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17)
- (5250 - 5330 @ 80), (24), DFS
- (5490 - 5730 @ 80), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-# Source:
-# http://www.trr.vu/attachments/category/130/GURL_for_Short-range_Radiocommunication_Devices2.pdf
-country VU: DFS-FCC
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (17), AUTO-BW
- (5250 - 5330 @ 80), (24), DFS, AUTO-BW
- (5490 - 5730 @ 160), (24), DFS
- (5735 - 5835 @ 80), (30)
-
-country WF: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country YE:
- (2402 - 2482 @ 40), (20)
-
-country YT: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country ZA: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
-country ZW: DFS-ETSI
- (2402 - 2482 @ 40), (20)
- (5170 - 5250 @ 80), (20), AUTO-BW
- (5250 - 5330 @ 80), (20), DFS, AUTO-BW
- (5490 - 5710 @ 160), (27), DFS
-
diff --git a/sub/layout/copylayout b/sub/layout/copylayout
index e9cea1c..82b303e 100755
--- a/sub/layout/copylayout
+++ b/sub/layout/copylayout
@@ -21,8 +21,6 @@ if $USE_VIRTIO_NETWORK ; then
netmodule=virtio_net
fi
-s6-hiercopy layout/initramfs $output/initramfs
-find "$output/initramfs" -type f -name .empty -size 0c -exec s6-rmrf {} \;
s6-hiercopy layout/rootfs $output/rootfs
find "$output/rootfs" -type f -name .empty -size 0c -exec s6-rmrf {} \;
s6-hiercopy layout/rwfs $output/rwfs
@@ -54,11 +52,11 @@ else
fi
# echo ${eth0_service} > $output/rootfs/etc/s6-rc/source-base/activate-eth0/contents
-for i in $output/initramfs/init $output/rootfs/etc/s6-rc/source-base/mount-*/* ; do
+for i in $output/rootfs/etc/s6-rc/source-base/mount-*/* ; do
sed -i -e "s/%%DISK%%/$disk/g" -e "s/%%PARTITION%%/$partition/g" $i
done
-chown -R root.root $output/initramfs $output/rootfs $output/rwfs $output/userfs
+chown -R root.root $output/rootfs $output/rwfs $output/userfs
s6-mkfifo -m 0600 -- $output/rootfs/etc/s6-linux-init/run-image/service/s6-svscan-log/fifo || s6-true