diff --git a/README.md b/README.md index d337e14a..c72eb5b9 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -inf/IX Linux Networking Made Easy +Infix Linux Networking Made Easy Introduction ------------ -Inf/IX is an embedded Linux Network Operating System (NOS) based on +Infix is an embedded Linux Network Operating System (NOS) based on [Buildroot][1] and [Finit][2]. @@ -12,7 +12,7 @@ Hardware ### aarch64 -By default, Inf/IX builds with support for the following boards (you +By default, Infix builds with support for the following boards (you may enable additional boards in the config, of course): - Marvell CN-9130 CRB diff --git a/board/common/mkfit.sh b/board/common/mkfit.sh index be5e40d1..9595a1f1 100755 --- a/board/common/mkfit.sh +++ b/board/common/mkfit.sh @@ -67,7 +67,7 @@ cat <$work/infix.its / { timestamp = <$(date +%s)>; - description = "Inf/IX ($FIT_ARCH)"; + description = "Infix ($FIT_ARCH)"; creator = "infix"; #address-cells = <0x1>; @@ -84,7 +84,7 @@ $(cat $work/kernel-load.itsi) }; ramdisk { - description = "Inf/IX"; + description = "Infix"; type = "ramdisk"; os = "linux"; arch = "$FIT_ARCH"; diff --git a/board/common/post-build.sh b/board/common/post-build.sh index 645453e6..b3ab0059 100755 --- a/board/common/post-build.sh +++ b/board/common/post-build.sh @@ -6,15 +6,15 @@ GIT_VERSION=$(git -C $BR2_EXTERNAL_INFIX_PATH describe --always --dirty --tags) # original Buildroot information. rm "$TARGET_DIR/etc/os-release" { - echo "NAME=\"Inf/IX\"" + echo "NAME=\"Infix\"" echo "VERSION=${GIT_VERSION}" echo "ID=infix" echo "VERSION_ID=${GIT_VERSION}" - echo "PRETTY_NAME=\"Inf/IX by KernelKit\"" + echo "PRETTY_NAME=\"Infix by KernelKit\"" echo "HOME_URL=https://github.com/KernelKit" } > "$TARGET_DIR/etc/os-release" -echo "Inf/IX by KernelKit $GIT_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version" +echo "Infix by KernelKit $GIT_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version" # Prevent regen of host key at every boot, /etc is saved across reboots if [ -L "$TARGET_DIR/etc/dropbear" ]; then diff --git a/board/common/rootfs/lib/infix/mount-rw b/board/common/rootfs/lib/infix/mount-rw index 0bf81f5e..9aaba710 100755 --- a/board/common/rootfs/lib/infix/mount-rw +++ b/board/common/rootfs/lib/infix/mount-rw @@ -1,7 +1,7 @@ #!/bin/sh # Called from /etc/fstab to ensure we have something writable mounted -# at /rw, which is used by Inf/IX to store device modifications made +# at /rw, which is used by Infix to store device modifications made # to /etc, /home, /root, and /var/lib. # # If a disk partiion labeled "infix-rw" is available, that is used to diff --git a/configs/aarch64_defconfig b/configs/aarch64_defconfig index 7ac679ea..e1566618 100644 --- a/configs/aarch64_defconfig +++ b/configs/aarch64_defconfig @@ -9,7 +9,7 @@ BR2_CCACHE_DIR="$(BR2_EXTERNAL_INFIX_PATH)/.ccache" BR2_ENABLE_DEBUG=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches" BR2_TARGET_GENERIC_HOSTNAME="infix" -BR2_TARGET_GENERIC_ISSUE="Inf/IX by KernelKit" +BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y BR2_SYSTEM_BIN_SH_BASH=y BR2_ENABLE_LOCALE_WHITELIST="C en_US en_CA" diff --git a/configs/amd64_defconfig b/configs/amd64_defconfig index 7c9491b0..626c77f0 100644 --- a/configs/amd64_defconfig +++ b/configs/amd64_defconfig @@ -8,7 +8,7 @@ BR2_CCACHE_DIR="$(BR2_EXTERNAL_INFIX_PATH)/.ccache" BR2_ENABLE_DEBUG=y BR2_GLOBAL_PATCH_DIR="$(BR2_EXTERNAL_INFIX_PATH)/patches" BR2_TARGET_GENERIC_HOSTNAME="infix" -BR2_TARGET_GENERIC_ISSUE="Inf/IX by KernelKit" +BR2_TARGET_GENERIC_ISSUE="Infix by KernelKit" BR2_INIT_FINIT=y BR2_SYSTEM_BIN_SH_BASH=y BR2_SYSTEM_DHCP="eth0" diff --git a/doc/infix1.svg b/doc/infix1.svg index 4f0d3fa7..b238b3c1 100644 --- a/doc/infix1.svg +++ b/doc/infix1.svg @@ -25,11 +25,11 @@ showgrid="false" inkscape:snap-others="false" inkscape:zoom="3.2002729" - inkscape:cx="363.87522" - inkscape:cy="316.84798" + inkscape:cx="356.21962" + inkscape:cy="317.00422" inkscape:window-width="2560" inkscape:window-height="1385" - inkscape:window-x="0" + inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="layer1" /> @@ -54,15 +54,15 @@ id="layer1"> inf/IX + y="396.05172" + id="tspan64">Infix - - - + x="115.6868" + y="307.97171"> + id="meshrow1076"> + id="meshpatch1078"> + id="stop1080" /> + id="stop1082" /> + id="stop1084" /> + id="stop1086" /> + y="68.793076"> + id="meshrow1090"> + id="meshpatch1092"> + id="stop1094" /> + id="stop1096" /> + id="stop1098" /> + id="stop1100" /> @@ -120,15 +112,15 @@ id="layer1"> inf/IX + y="396.05172" + id="tspan1205">Infix diff --git a/doc/text3133.png b/doc/text3133.png index 7fe1638f..6c203764 100644 Binary files a/doc/text3133.png and b/doc/text3133.png differ diff --git a/doc/text3134.png b/doc/text3134.png index 984f924a..85a43baa 100644 Binary files a/doc/text3134.png and b/doc/text3134.png differ diff --git a/external.desc b/external.desc index af8d2e2d..eecd1e6b 100644 --- a/external.desc +++ b/external.desc @@ -1,2 +1,2 @@ name: INFIX -desc: Inf/IX by KernelKit +desc: Infix by KernelKit