Skip to content

installer: name a drawer install's drivers through AmiNetXDuo: #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tinic merged 1 commit into from
Oct 1, 2026
Merged

installer: name a drawer install's drivers through AmiNetXDuo: #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions install/Install-AmiNetXDuo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,19 +686,19 @@
(set DEV_WRITE dev_write)

(if (AND (= CARD_INDEX 0) DO_ANXNET)
(set DEV_WRITE D_ANXGENET)
(set DEV_WRITE W_ANXGENET)
(if (AND (= CARD_INDEX 11) DO_ANXNET)
(set DEV_WRITE D_ANXWIFIPI)
(set DEV_WRITE W_ANXWIFIPI)
(if (AND (= CARD_INDEX 1) (= dev_present 0) DO_ANXNET HAVE_ANXZZ9000)
; MNT's ZZ9000Net.device is absent and this archive carries the
; supplied driver for the card: its own image, no CARD= key -- it
; drives nothing else. An archive without it falls through to the
; missing-driver warning below, like any other card.
(set DEV_WRITE D_ANXZZ9000)
(set DEV_WRITE W_ANXZZ9000)
(if (= dev_present 0)
(if (AND DO_ANXNET (> (strlen CARD_KEY) 0))
(
(set DEV_WRITE D_ANX)
(set DEV_WRITE W_ANX)
(set USE_CARD 1)
)
(if WARN_DRIVER
Expand Down Expand Up @@ -1198,6 +1198,17 @@
(set D_ANXGENET (tackon (tackon D_DEVS "Networks") "anxgenet.device"))
(set D_ANXWIFIPI (tackon (tackon D_DEVS "Networks") "anxwifipi.device"))
(set D_ANXZZ9000 (tackon (tackon D_DEVS "Networks") "anxzz9000.device"))

; What a DEVICE= line names. A drawer install names its drivers through the
; AmiNetXDuo: assign, as it names its commands (C_PREFIX): moving the assign
; to another drawer then moves the drivers with the library. The absolute
; drawer path kept the old drawer's drivers under the new library.
(set W_NETWORKS (tackon D_DEVS "Networks"))
(if DRAWER_LAYOUT (set W_NETWORKS "AmiNetXDuo:Devs/Networks"))
(set W_ANX (tackon W_NETWORKS "anxnet.device"))
(set W_ANXGENET (tackon W_NETWORKS "anxgenet.device"))
(set W_ANXWIFIPI (tackon W_NETWORKS "anxwifipi.device"))
(set W_ANXZZ9000 (tackon W_NETWORKS "anxzz9000.device"))
(set D_BSD_OLD (cat D_BSD ".old"))
(set D_UG_OLD (cat D_UG ".old"))
(set D_TLS_OLD (cat D_TLS ".old"))
Expand Down
15 changes: 13 additions & 2 deletions install/test/run-workbench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@ if [ -n "$EXPECTED_SECOND_IF" ]; then
_second_device=$(sed -n 's/^DEVICE=//p' "$_second_real" 2>/dev/null | head -1 |
tr -d '\r' | sed 's/[[:space:]]*$//')
case "$_second_device" in
"$EXPECTED_SECOND_DEVICE"|"DEVS:Networks/$EXPECTED_SECOND_DEVICE") ;;
"$EXPECTED_SECOND_DEVICE"|"DEVS:Networks/$EXPECTED_SECOND_DEVICE"|"AmiNetXDuo:Devs/Networks/$EXPECTED_SECOND_DEVICE") ;;
*) echo "!! $EXPECTED_SECOND_IF uses ${_second_device:-no device}; wanted $EXPECTED_SECOND_DEVICE"
fail=1 ;;
esac
Expand Down Expand Up @@ -2675,6 +2675,17 @@ if [ -n "$IFACE_FILE" ] && [ -f "$IFACE_FILE" ]; then
tr -d '\r' | sed 's/[[:space:]]*$//')
fi

# A drawer install names its own drivers through the AmiNetXDuo: assign, so
# moving the assign to another drawer moves the drivers with the library.
case "$DRAWER:$INSTALLER_DEVICE" in
1:*anx*.device)
case "$INSTALLER_DEVICE" in
AmiNetXDuo:Devs/Networks/*) ;;
*) echo "!! drawer install wrote DEVICE=$INSTALLER_DEVICE; wanted AmiNetXDuo:Devs/Networks/..."
fail=1 ;;
esac ;;
esac

CARD_SELECTED=no
MANUAL_ACTUAL_CARD=""
if [ "$MANUAL_CARD" = "1" ]; then
Expand All @@ -2686,7 +2697,7 @@ if [ "$MANUAL_CARD" = "1" ]; then
esac
elif [ -n "$EXPECTED_AUTO_DEVICE" ]; then
case "$INSTALLER_DEVICE" in
"$EXPECTED_AUTO_DEVICE"|"DEVS:Networks/$EXPECTED_AUTO_DEVICE")
"$EXPECTED_AUTO_DEVICE"|"DEVS:Networks/$EXPECTED_AUTO_DEVICE"|"AmiNetXDuo:Devs/Networks/$EXPECTED_AUTO_DEVICE")
CARD_SELECTED=yes ;;
esac
else
Expand Down
Loading