Skip to content

Commit ec720d2

Browse files
fix(base-files): do not set PYTHONHOME
Signed-off-by: Anhad Singh <[email protected]>
1 parent 93a215b commit ec720d2

File tree

3 files changed

+50
-3
lines changed

3 files changed

+50
-3
lines changed

base-files/.bashrc renamed to base-files/etc/bash/bash.bashrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ export TERM=xterm-256color
99
alias ls="ls --color=auto"
1010
alias clear='printf "\e[2J\e[H"'
1111

12-
export PYTHONHOME="/usr/lib"
13-
1412
# todo: https://github.com/sharkdp/bat/blob/master/src/bin/bat/directories.rs panics if not set?
1513
export BAT_CONFIG_DIR="/cfg/bat"
1614
export BAT_CACHE_PATH="/cache/bat"

base-files/etc/profile

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# /etc/profile
2+
3+
# This file was copied from my host Arch Linux installation. Credits to them :)
4+
5+
# Append "$1" to $PATH when not already in.
6+
# This function API is accessible to scripts in /etc/profile.d
7+
append_path () {
8+
case ":$PATH:" in
9+
*:"$1":*)
10+
;;
11+
*)
12+
PATH="${PATH:+$PATH:}$1"
13+
esac
14+
}
15+
16+
# Append our default paths
17+
append_path '/usr/local/sbin'
18+
append_path '/usr/local/bin'
19+
append_path '/usr/bin'
20+
21+
# Force PATH to be environment
22+
export PATH
23+
24+
# Load profiles from /etc/profile.d
25+
if test -d /etc/profile.d/; then
26+
for profile in /etc/profile.d/*.sh; do
27+
test -r "$profile" && . "$profile"
28+
done
29+
unset profile
30+
fi
31+
32+
# Unload our profile API functions
33+
unset -f append_path
34+
35+
# Source global bash config, when interactive but not posix or sh mode
36+
if test "$BASH" &&\
37+
test "$PS1" &&\
38+
test -z "$POSIXLY_CORRECT" &&\
39+
test "${0#-}" != sh &&\
40+
test -r /etc/bash.bashrc
41+
then
42+
. /etc/bash.bashrc
43+
fi
44+
45+
# Termcap is outdated, old, and crusty, kill it.
46+
unset TERMCAP
47+
48+
# Man is much better than us at figuring this out
49+
unset MANPATH

src/aero_kernel/src/acpi/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl AcpiTable {
8686
}
8787
}
8888

89-
#[repr(packed)]
89+
#[repr(C, packed)]
9090
#[derive(Clone, Copy, Debug)]
9191
pub struct GenericAddressStructure {
9292
pub address_space: u8,

0 commit comments

Comments
 (0)